diff --git a/.php_cs.cache b/.php_cs.cache index f880cec2d..9dd86ab0f 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"7.1.17-1+ubuntu17.10.1+deb.sury.org+1","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"no_php4_constructor":true,"php_unit_namespaced":{"target":"6.0"},"php_unit_dedicate_assert":{"target":"5.6"},"php_unit_expectation":{"target":"5.6"},"php_unit_mock":{"target":"5.5"},"php_unit_no_expectation_annotation":{"target":"4.3"},"binary_operator_spaces":{"align_double_arrow":true,"align_equals":true},"blank_line_after_opening_tag":true,"blank_line_before_statement":true,"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"magic_constant_casing":true,"method_argument_space":{"ensure_fully_multiline":true},"native_function_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["break","continue","extra","return","throw","use","parenthesis_brace_block","square_brace_block","curly_brace_block"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":{"elements":["property"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"modernize_types_casting":true,"align_multiline_comment":true,"array_syntax":{"syntax":"short"},"combine_consecutive_issets":true,"combine_consecutive_unsets":true,"compact_nullable_typehint":true,"escape_implicit_backslashes":true,"explicit_indirect_variable":true,"explicit_string_variable":true,"final_internal_class":true,"header_comment":{"commentType":"PHPDoc","header":"PHPPgAdmin v6.0.0-beta.46"},"heredoc_to_nowdoc":true,"list_syntax":{"syntax":"long"},"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"no_null_property_initialization":true,"no_short_echo_tag":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"php_unit_strict":true,"php_unit_test_annotation":true,"php_unit_test_class_requires_covers":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"phpdoc_types_order":true,"strict_param":true},"hashes":{"src\/classes\/ADONewConnection.php":2969738412,"src\/classes\/ADOdbException.php":3007451176,"src\/classes\/PluginManager.php":3349920179,"src\/classes\/ADORecordSet.php":2487754159,"src\/classes\/ContainerUtils.php":1280337655,"src\/classes\/Translations.php":3518299178,"src\/classes\/ArrayRecordSet.php":781875692,"src\/classes\/Misc.php":1637690653,"src\/controllers\/GroupsController.php":3288820046,"src\/controllers\/DbexportController.php":3390214063,"src\/controllers\/RulesController.php":1230446051,"src\/controllers\/OperatorsController.php":4140625602,"src\/controllers\/AlldbController.php":1752986208,"src\/controllers\/LanguagesController.php":3778969195,"src\/controllers\/TypesController.php":1599649630,"src\/controllers\/SequencesController.php":403760218,"src\/controllers\/ServersController.php":1063577541,"src\/controllers\/AcinsertController.php":2746256934,"src\/controllers\/ConversionsController.php":3262643627,"src\/controllers\/SqleditController.php":3044783495,"src\/controllers\/BaseController.php":2790674406,"src\/controllers\/UsersController.php":2446413695,"src\/controllers\/SqlController.php":3857995893,"src\/controllers\/DatabaseController.php":1986025722,"src\/controllers\/TblpropertiesController.php":1357165384,"src\/controllers\/TablespacesController.php":1628686307,"src\/controllers\/DataimportController.php":1816969049,"src\/controllers\/OpclassesController.php":319044406,"src\/controllers\/HelpController.php":2500174028,"src\/controllers\/ViewsController.php":3520681060,"src\/controllers\/DataexportController.php":2335931883,"src\/controllers\/ColpropertiesController.php":500485033,"src\/controllers\/TriggersController.php":1085092155,"src\/controllers\/FunctionsController.php":3299688102,"src\/controllers\/AggregatesController.php":3932457095,"src\/controllers\/SchemasController.php":4070114037,"src\/controllers\/IntroController.php":4183644868,"src\/controllers\/DisplayController.php":117244859,"src\/controllers\/ViewpropertiesController.php":689370786,"src\/controllers\/InfoController.php":4265197351,"src\/controllers\/TablesController.php":3551539624,"src\/controllers\/FulltextController.php":2234513159,"src\/controllers\/CastsController.php":2304696314,"src\/controllers\/LoginController.php":947152141,"src\/controllers\/DomainsController.php":2358158946,"src\/controllers\/MaterializedviewsController.php":3231992123,"src\/controllers\/BrowserController.php":3742508770,"src\/controllers\/HistoryController.php":900040622,"src\/controllers\/MaterializedviewpropertiesController.php":3988088762,"src\/controllers\/PrivilegesController.php":1576861891,"src\/controllers\/ConstraintsController.php":1731220252,"src\/controllers\/IndexesController.php":3408647371,"src\/controllers\/RolesController.php":3377909342,"src\/database\/Postgres84.php":2985653685,"src\/database\/Postgres81.php":1869700275,"src\/database\/Postgres92.php":2577241885,"src\/database\/Postgres94.php":1010948835,"src\/database\/Postgres93.php":1317099201,"src\/database\/Postgres83.php":59463290,"src\/database\/Postgres95.php":1964193971,"src\/database\/Postgres90.php":326174777,"src\/database\/Postgres96.php":4233463944,"src\/database\/Postgres74.php":701279716,"src\/database\/Postgres80.php":1298634176,"src\/database\/ADOdbBase.php":1150046532,"src\/database\/Postgres10.php":214079631,"src\/database\/Postgres82.php":4024387569,"src\/database\/Postgres91.php":3485286420,"src\/database\/Postgres.php":3991688953,"src\/database\/Connection.php":828935425,"src\/decorators\/ReplaceDecorator.php":4175896248,"src\/decorators\/Decorator.php":2228354982,"src\/decorators\/IfEmptyDecorator.php":4242061178,"src\/decorators\/ActionUrlDecorator.php":1219204515,"src\/decorators\/BranchUrlDecorator.php":787309285,"src\/decorators\/UrlDecorator.php":2705567993,"src\/decorators\/ConcatDecorator.php":3658767494,"src\/decorators\/RedirectUrlDecorator.php":1764217759,"src\/decorators\/ArrayMergeDecorator.php":3359745272,"src\/decorators\/CallbackDecorator.php":3516674884,"src\/decorators\/FieldDecorator.php":3982559527,"src\/help\/PostgresDoc96.php":925139997,"src\/help\/PostgresDoc84.php":3214869137,"src\/help\/PostgresDoc80.php":3807334535,"src\/help\/PostgresDoc81.php":619562046,"src\/help\/PostgresDoc90.php":1506663187,"src\/help\/PostgresDoc83.php":3242748887,"src\/help\/PostgresDoc92.php":1831770547,"src\/help\/PostgresDoc82.php":2545244772,"src\/help\/PostgresDoc95.php":792608325,"src\/help\/PostgresDoc94.php":3772487351,"src\/help\/PostgresDoc91.php":3209353877,"src\/help\/PostgresDoc74.php":4128179939,"src\/help\/PostgresDoc93.php":2383865201,"src\/help\/PostgresDoc10.php":3114109996,"src\/translations\/Hebrew.php":879645786,"src\/translations\/Italian.php":2492600476,"src\/translations\/Galician.php":837635722,"src\/translations\/Japanese.php":2627141306,"src\/translations\/Dutch.php":2502997902,"src\/translations\/Catalan.php":1606698496,"src\/translations\/Lithuanian.php":2928422703,"src\/translations\/Mongol.php":2644926398,"src\/translations\/ChineseUtf8ZhTw.php":4104782199,"src\/translations\/ChineseUtf8ZhCn.php":1427449938,"src\/translations\/Ukrainian.php":1160756759,"src\/translations\/PortuguesePt.php":2628836842,"src\/translations\/ChineseTr.php":2026874369,"src\/translations\/PortugueseBr.php":892220463,"src\/translations\/RussianUtf8.php":1336057745,"src\/translations\/Greek.php":515982078,"src\/translations\/Danish.php":2484457684,"src\/translations\/Arabic.php":149728643,"src\/translations\/Hungarian.php":2285694581,"src\/translations\/Polish.php":468351832,"src\/translations\/English.php":3258178649,"src\/translations\/Swedish.php":1588499492,"src\/translations\/Romanian.php":1749382554,"src\/translations\/Afrikaans.php":1631968630,"src\/translations\/German.php":397715422,"src\/translations\/French.php":636572207,"src\/translations\/Czech.php":3308731049,"src\/translations\/Spanish.php":3587999990,"src\/translations\/ChineseSim.php":3322518649,"src\/translations\/Russian.php":1057768301,"src\/translations\/Slovak.php":863194954,"src\/translations\/Turkish.php":3883907486,"src\/xhtml\/HTMLNavbarController.php":2101037085,"src\/xhtml\/HTMLTableController.php":627054078,"src\/xhtml\/HTMLController.php":2643226970,"src\/xhtml\/XHtmlOption.php":799385608,"src\/xhtml\/XHtmlButton.php":475195930,"src\/xhtml\/XHtmlSimpleElement.php":1563606729,"src\/xhtml\/XHtmlSelect.php":2265350205,"src\/xhtml\/HTMLFooterController.php":1734172733,"src\/xhtml\/HTMLHeaderController.php":874259932,"src\/xhtml\/TreeController.php":4020883336,"src\/xhtml\/XHtmlElement.php":48761837,"tests\/simpletest\/config.tests.php":2095115662,"tests\/simpletest\/testcase\/Schemas\/ConversionTest.php":3100395617,"tests\/simpletest\/testcase\/Schemas\/OperatorTest.php":714759046,"tests\/simpletest\/testcase\/Schemas\/AggregateTest.php":349255858,"tests\/simpletest\/testcase\/Schemas\/FunctionTest.php":4195543992,"tests\/simpletest\/testcase\/Schemas\/DomainTest.php":436911809,"tests\/simpletest\/testcase\/Schemas\/TypeTest.php":3683532851,"tests\/simpletest\/testcase\/Schemas\/TableTest.php":1516713951,"tests\/simpletest\/testcase\/Schemas\/SequenceTest.php":2659008121,"tests\/simpletest\/testcase\/Schemas\/OpClassTest.php":2670876613,"tests\/simpletest\/testcase\/Schemas\/SchemasGroupTest.php":3585874541,"tests\/simpletest\/testcase\/Schemas\/ViewTest.php":3903737683,"tests\/simpletest\/testcase\/Server\/ServerGroupTest.php":4244122822,"tests\/simpletest\/testcase\/Server\/GroupsTest.php":3426387805,"tests\/simpletest\/testcase\/Server\/ReportsTest.php":2692330451,"tests\/simpletest\/testcase\/Server\/UsersTest.php":3946339215,"tests\/simpletest\/testcase\/Server\/TableSpacesTest.php":568009779,"tests\/simpletest\/testcase\/Databases\/FindObjectsTest.php":2554852522,"tests\/simpletest\/testcase\/Databases\/SqlTest.php":3029093383,"tests\/simpletest\/testcase\/Databases\/CastsTest.php":2395861911,"tests\/simpletest\/testcase\/Databases\/LanguageTest.php":4228179040,"tests\/simpletest\/testcase\/Databases\/SchemaBasicTest.php":2015140002,"tests\/simpletest\/testcase\/Databases\/AdminTest.php":2581748152,"tests\/simpletest\/testcase\/Databases\/DatabaseTest.php":1295655385,"tests\/simpletest\/testcase\/Databases\/VariablesTest.php":3843339374,"tests\/simpletest\/testcase\/Databases\/DatabaseGroupTest.php":317427171,"tests\/simpletest\/testcase\/Databases\/HelpTest.php":726833678,"tests\/simpletest\/testcase\/Databases\/ProcessesTest.php":3210673786,"tests\/simpletest\/testcase\/Public\/common.php":1297548726,"tests\/simpletest\/testcase\/Public\/SetPrecondition.php":3412831225,"tests\/simpletest\/testcase\/Tables\/IndexesTest.php":240025848,"tests\/simpletest\/testcase\/Tables\/ConstraintsTest.php":3395231954,"tests\/simpletest\/testcase\/Tables\/TableGroupTest.php":3353144101,"tests\/simpletest\/testcase\/Tables\/DeadlockTest.php":1298958898,"tests\/simpletest\/testcase\/Tables\/RulesTest.php":1862029710,"tests\/simpletest\/testcase\/Tables\/ColumnTest.php":884903494,"tests\/simpletest\/testcase\/Tables\/InfoTest.php":3896068178,"tests\/simpletest\/testcase\/Tables\/TriggersTest.php":2287253366,"tests\/simpletest\/testcase\/simpletest.inc.php":2274415542,"tests\/simpletest\/testcase\/phpcoverage.inc.php":3621930486,"tests\/simpletest\/testcase\/testphpPgAdminMain.php":3708798342,"tests\/simpletest\/testcase\/coveragephpPgAdminMain.php":2565942488,"tests\/simpletest\/testcase\/Common\/ExportTest.php":2754807034,"tests\/simpletest\/testcase\/Common\/ImportTest.php":1652469026,"tests\/simpletest\/testcase\/Common\/CommonGroupTest.php":1452033449,"tests\/simpletest\/testcase\/Common\/SecurityTest.php":3544998377,"tests\/simpletest\/tests.php":1172469454,"tests\/unit\/ViewTest.php":2961075608,"tests\/_support\/UnitTester.php":3975028120,"tests\/_support\/FunctionalTester.php":3141791838,"tests\/_support\/Helper\/Unit.php":2712093571,"tests\/_support\/Helper\/Functional.php":3588618101,"tests\/_support\/Helper\/Acceptance.php":4235356409,"tests\/_support\/AcceptanceTester.php":2031842130,"tests\/_support\/_generated\/UnitTesterActions.php":816899145,"tests\/views\/rules.php":1191875194,"tests\/views\/info.php":2118670009,"tests\/views\/intro.php":4250344329,"tests\/views\/database.php":1626699852,"tests\/views\/triggers.php":2874001020,"tests\/views\/functions.php":3712032911,"tests\/views\/dbexport.php":250255110,"tests\/views\/sql.php":3631156130,"tests\/views\/display.php":2833012659,"tests\/views\/acinsert.php":524129270,"tests\/views\/languages.php":2978135876,"tests\/views\/views.php":322609328,"tests\/views\/types.php":988450029,"tests\/views\/conversions.php":1786221915,"tests\/views\/users.php":2910368777,"tests\/views\/indexes.php":1294691244,"tests\/views\/login.php":1152458015,"tests\/views\/tables.php":1829769938,"tests\/views\/servers.php":4291897560,"tests\/views\/tblproperties.php":2088706481,"tests\/views\/tablespaces.php":3202940110,"tests\/views\/privileges.php":489484121,"tests\/views\/casts.php":2644855814,"tests\/views\/sqledit.php":3301092715,"tests\/views\/fulltext.php":1423684813,"tests\/views\/browser.php":3077537596,"tests\/views\/colproperties.php":3407257424,"tests\/views\/roles.php":786527092,"tests\/views\/groups.php":1792210003,"tests\/views\/operators.php":496526301,"tests\/views\/domains.php":2307341523,"tests\/views\/materializedviews.php":3819554579,"tests\/views\/history.php":1649379881,"tests\/views\/alldb.php":2100951401,"tests\/views\/opclasses.php":415330427,"tests\/views\/constraints.php":3232723320,"tests\/views\/sequences.php":1804190271,"tests\/views\/schemas.php":3515928529,"tests\/views\/dataimport.php":85346073,"tests\/views\/help.php":2894579642,"tests\/views\/dataexport.php":1582010830,"tests\/views\/viewproperties.php":2464182483,"tests\/views\/aggregates.php":1681015708,"tests\/views\/materializedviewproperties.php":1582633696,"tests\/selenium\/src\/12-admin.php":2327717251,"tests\/selenium\/src\/01-roles.php":1998560322,"tests\/selenium\/src\/30-view.php":2923385644,"tests\/selenium\/src\/99-cleantests.php":597093588,"tests\/selenium\/src\/15-sequence.php":493012763,"tests\/selenium\/src\/20-constraint.php":3958961940,"tests\/selenium\/src\/25-column.php":4159814147,"tests\/selenium\/src\/06-schema.php":4066439848,"tests\/selenium\/src\/35-index.php":2698049597,"tests\/selenium\/src\/04-database.php":1694280644,"tests\/selenium\/src\/10-table.php":4032523856,"tests\/selenium\/src\/08-domaine.php":4135309237,"tests\/selenium\/testBuilder.class.php":4041514431,"tests\/selenium\/TestSuite.php":3340193892}} \ No newline at end of file +{"php":"7.1.17-1+ubuntu17.10.1+deb.sury.org+1","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"no_php4_constructor":true,"php_unit_namespaced":{"target":"6.0"},"php_unit_dedicate_assert":{"target":"5.6"},"php_unit_expectation":{"target":"5.6"},"php_unit_mock":{"target":"5.5"},"php_unit_no_expectation_annotation":{"target":"4.3"},"binary_operator_spaces":{"align_double_arrow":true,"align_equals":true},"blank_line_after_opening_tag":true,"blank_line_before_statement":true,"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"magic_constant_casing":true,"method_argument_space":{"ensure_fully_multiline":true},"native_function_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["break","continue","extra","return","throw","use","parenthesis_brace_block","square_brace_block","curly_brace_block"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":{"elements":["property"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"modernize_types_casting":true,"align_multiline_comment":true,"array_syntax":{"syntax":"short"},"combine_consecutive_issets":true,"combine_consecutive_unsets":true,"compact_nullable_typehint":true,"escape_implicit_backslashes":true,"explicit_indirect_variable":true,"explicit_string_variable":true,"final_internal_class":true,"header_comment":{"commentType":"PHPDoc","header":"PHPPgAdmin v6.0.0-beta.47"},"heredoc_to_nowdoc":true,"list_syntax":{"syntax":"long"},"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"no_null_property_initialization":true,"no_short_echo_tag":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"php_unit_strict":true,"php_unit_test_annotation":true,"php_unit_test_class_requires_covers":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"phpdoc_types_order":true,"strict_param":true},"hashes":{"src\/classes\/ADONewConnection.php":1936607358,"src\/classes\/ADOdbException.php":4039008216,"src\/classes\/PluginManager.php":2589030017,"src\/classes\/ADORecordSet.php":3912454068,"src\/classes\/ContainerUtils.php":1845230348,"src\/classes\/Translations.php":2152689368,"src\/classes\/ArrayRecordSet.php":2687130863,"src\/classes\/Misc.php":117332130,"src\/controllers\/GroupsController.php":4106534014,"src\/controllers\/DbexportController.php":798014074,"src\/controllers\/RulesController.php":2405645592,"src\/controllers\/OperatorsController.php":908749951,"src\/controllers\/AlldbController.php":2312036015,"src\/controllers\/LanguagesController.php":1128048099,"src\/controllers\/TypesController.php":2491052738,"src\/controllers\/SequencesController.php":3892130883,"src\/controllers\/ServersController.php":474827700,"src\/controllers\/AcinsertController.php":3653383689,"src\/controllers\/ConversionsController.php":1722729930,"src\/controllers\/SqleditController.php":2078095039,"src\/controllers\/BaseController.php":1333245161,"src\/controllers\/UsersController.php":2409669168,"src\/controllers\/SqlController.php":197263620,"src\/controllers\/DatabaseController.php":2592874291,"src\/controllers\/TblpropertiesController.php":1553534368,"src\/controllers\/TablespacesController.php":3583093020,"src\/controllers\/DataimportController.php":1311250395,"src\/controllers\/OpclassesController.php":1587492478,"src\/controllers\/HelpController.php":3406915192,"src\/controllers\/ViewsController.php":4122907366,"src\/controllers\/DataexportController.php":248702836,"src\/controllers\/ColpropertiesController.php":4249943401,"src\/controllers\/TriggersController.php":545064858,"src\/controllers\/FunctionsController.php":2032411741,"src\/controllers\/AggregatesController.php":2834077443,"src\/controllers\/SchemasController.php":875220090,"src\/controllers\/IntroController.php":1083272494,"src\/controllers\/DisplayController.php":2040059074,"src\/controllers\/ViewpropertiesController.php":291970803,"src\/controllers\/InfoController.php":2476424096,"src\/controllers\/TablesController.php":3643845263,"src\/controllers\/FulltextController.php":15423359,"src\/controllers\/CastsController.php":2138950663,"src\/controllers\/LoginController.php":3849573990,"src\/controllers\/DomainsController.php":909458277,"src\/controllers\/MaterializedviewsController.php":1967333004,"src\/controllers\/BrowserController.php":3715600170,"src\/controllers\/HistoryController.php":734295084,"src\/controllers\/MaterializedviewpropertiesController.php":2306134357,"src\/controllers\/PrivilegesController.php":1472447803,"src\/controllers\/ConstraintsController.php":3451951499,"src\/controllers\/IndexesController.php":4047687910,"src\/controllers\/RolesController.php":3272039758,"src\/database\/Postgres84.php":1561370815,"src\/database\/Postgres81.php":3043831577,"src\/database\/Postgres92.php":3773386401,"src\/database\/Postgres94.php":1669367415,"src\/database\/Postgres93.php":393155139,"src\/database\/Postgres83.php":4145487586,"src\/database\/Postgres95.php":1935536142,"src\/database\/Postgres90.php":288609183,"src\/database\/Postgres96.php":2409221098,"src\/database\/Postgres74.php":2054981447,"src\/database\/Postgres80.php":84301695,"src\/database\/ADOdbBase.php":2118408681,"src\/database\/Postgres10.php":2652802497,"src\/database\/Postgres82.php":280494978,"src\/database\/Postgres91.php":1683260756,"src\/database\/Postgres.php":3900953636,"src\/database\/Connection.php":4121087491,"src\/decorators\/ReplaceDecorator.php":3625888251,"src\/decorators\/Decorator.php":3626464841,"src\/decorators\/IfEmptyDecorator.php":3608856360,"src\/decorators\/ActionUrlDecorator.php":2032766370,"src\/decorators\/BranchUrlDecorator.php":2671666761,"src\/decorators\/UrlDecorator.php":3606325374,"src\/decorators\/ConcatDecorator.php":2242183134,"src\/decorators\/RedirectUrlDecorator.php":2635318648,"src\/decorators\/ArrayMergeDecorator.php":4219407266,"src\/decorators\/CallbackDecorator.php":2201355690,"src\/decorators\/FieldDecorator.php":4047441457,"src\/help\/PostgresDoc96.php":4179097046,"src\/help\/PostgresDoc84.php":2751210730,"src\/help\/PostgresDoc80.php":3243228560,"src\/help\/PostgresDoc81.php":2151346659,"src\/help\/PostgresDoc90.php":1169096040,"src\/help\/PostgresDoc83.php":1244173403,"src\/help\/PostgresDoc92.php":694040055,"src\/help\/PostgresDoc82.php":1350472182,"src\/help\/PostgresDoc95.php":3775745934,"src\/help\/PostgresDoc94.php":4239962316,"src\/help\/PostgresDoc91.php":2737437934,"src\/help\/PostgresDoc74.php":1570976303,"src\/help\/PostgresDoc93.php":3358070544,"src\/help\/PostgresDoc10.php":3051725925,"src\/translations\/Hebrew.php":150005452,"src\/translations\/Italian.php":444178640,"src\/translations\/Galician.php":1035231631,"src\/translations\/Japanese.php":328229340,"src\/translations\/Dutch.php":3977237083,"src\/translations\/Catalan.php":3120944432,"src\/translations\/Lithuanian.php":588024678,"src\/translations\/Mongol.php":3737400192,"src\/translations\/ChineseUtf8ZhTw.php":2627004011,"src\/translations\/ChineseUtf8ZhCn.php":1774925156,"src\/translations\/Ukrainian.php":1032778,"src\/translations\/PortuguesePt.php":1539512239,"src\/translations\/ChineseTr.php":4216196891,"src\/translations\/PortugueseBr.php":3384280617,"src\/translations\/RussianUtf8.php":865125702,"src\/translations\/Greek.php":4219352443,"src\/translations\/Danish.php":1837770915,"src\/translations\/Arabic.php":4032545658,"src\/translations\/Hungarian.php":2599944275,"src\/translations\/Polish.php":2403183678,"src\/translations\/English.php":3488389842,"src\/translations\/Swedish.php":1680412584,"src\/translations\/Romanian.php":777347005,"src\/translations\/Afrikaans.php":1216773616,"src\/translations\/German.php":1453045136,"src\/translations\/French.php":479526631,"src\/translations\/Czech.php":901202887,"src\/translations\/Spanish.php":3421654063,"src\/translations\/ChineseSim.php":1392211611,"src\/translations\/Russian.php":1454378211,"src\/translations\/Slovak.php":1026410139,"src\/translations\/Turkish.php":103408625,"src\/xhtml\/HTMLNavbarController.php":3907487867,"src\/xhtml\/HTMLTableController.php":1101194372,"src\/xhtml\/HTMLController.php":1885431142,"src\/xhtml\/XHtmlOption.php":547957012,"src\/xhtml\/XHtmlButton.php":3153060610,"src\/xhtml\/XHtmlSimpleElement.php":1287438387,"src\/xhtml\/XHtmlSelect.php":617350974,"src\/xhtml\/HTMLFooterController.php":3804582164,"src\/xhtml\/HTMLHeaderController.php":2501513435,"src\/xhtml\/TreeController.php":1178933304,"src\/xhtml\/XHtmlElement.php":3364196288,"tests\/simpletest\/config.tests.php":2421467280,"tests\/simpletest\/testcase\/Schemas\/ConversionTest.php":2564518116,"tests\/simpletest\/testcase\/Schemas\/OperatorTest.php":2465298436,"tests\/simpletest\/testcase\/Schemas\/AggregateTest.php":1336138837,"tests\/simpletest\/testcase\/Schemas\/FunctionTest.php":228164599,"tests\/simpletest\/testcase\/Schemas\/DomainTest.php":1328686611,"tests\/simpletest\/testcase\/Schemas\/TypeTest.php":615320881,"tests\/simpletest\/testcase\/Schemas\/TableTest.php":3617514388,"tests\/simpletest\/testcase\/Schemas\/SequenceTest.php":781136534,"tests\/simpletest\/testcase\/Schemas\/OpClassTest.php":625082747,"tests\/simpletest\/testcase\/Schemas\/SchemasGroupTest.php":1850666171,"tests\/simpletest\/testcase\/Schemas\/ViewTest.php":4205787707,"tests\/simpletest\/testcase\/Server\/ServerGroupTest.php":3469635861,"tests\/simpletest\/testcase\/Server\/GroupsTest.php":3622738815,"tests\/simpletest\/testcase\/Server\/ReportsTest.php":2800596287,"tests\/simpletest\/testcase\/Server\/UsersTest.php":457178364,"tests\/simpletest\/testcase\/Server\/TableSpacesTest.php":3268374422,"tests\/simpletest\/testcase\/Databases\/FindObjectsTest.php":3014184984,"tests\/simpletest\/testcase\/Databases\/SqlTest.php":3896451083,"tests\/simpletest\/testcase\/Databases\/CastsTest.php":3819141277,"tests\/simpletest\/testcase\/Databases\/LanguageTest.php":1622151752,"tests\/simpletest\/testcase\/Databases\/SchemaBasicTest.php":3290225265,"tests\/simpletest\/testcase\/Databases\/AdminTest.php":2069525493,"tests\/simpletest\/testcase\/Databases\/DatabaseTest.php":2705998080,"tests\/simpletest\/testcase\/Databases\/VariablesTest.php":854791746,"tests\/simpletest\/testcase\/Databases\/DatabaseGroupTest.php":2067035374,"tests\/simpletest\/testcase\/Databases\/HelpTest.php":69303524,"tests\/simpletest\/testcase\/Databases\/ProcessesTest.php":112831989,"tests\/simpletest\/testcase\/Public\/common.php":60125681,"tests\/simpletest\/testcase\/Public\/SetPrecondition.php":850557020,"tests\/simpletest\/testcase\/Tables\/IndexesTest.php":2615400423,"tests\/simpletest\/testcase\/Tables\/ConstraintsTest.php":2280847265,"tests\/simpletest\/testcase\/Tables\/TableGroupTest.php":3556716063,"tests\/simpletest\/testcase\/Tables\/DeadlockTest.php":9911131,"tests\/simpletest\/testcase\/Tables\/RulesTest.php":4056032989,"tests\/simpletest\/testcase\/Tables\/ColumnTest.php":1265391834,"tests\/simpletest\/testcase\/Tables\/InfoTest.php":3727467954,"tests\/simpletest\/testcase\/Tables\/TriggersTest.php":3908740286,"tests\/simpletest\/testcase\/simpletest.inc.php":2274415542,"tests\/simpletest\/testcase\/phpcoverage.inc.php":3621930486,"tests\/simpletest\/testcase\/testphpPgAdminMain.php":4029849140,"tests\/simpletest\/testcase\/coveragephpPgAdminMain.php":1316275320,"tests\/simpletest\/testcase\/Common\/ExportTest.php":4211312532,"tests\/simpletest\/testcase\/Common\/ImportTest.php":4088346916,"tests\/simpletest\/testcase\/Common\/CommonGroupTest.php":884851375,"tests\/simpletest\/testcase\/Common\/SecurityTest.php":4017349224,"tests\/simpletest\/tests.php":797804225,"tests\/unit\/ViewTest.php":1512916417,"tests\/_support\/UnitTester.php":3145320975,"tests\/_support\/FunctionalTester.php":2955205082,"tests\/_support\/Helper\/Unit.php":3145774483,"tests\/_support\/Helper\/Functional.php":1220699222,"tests\/_support\/Helper\/Acceptance.php":1633024986,"tests\/_support\/AcceptanceTester.php":1920752342,"tests\/_support\/_generated\/UnitTesterActions.php":284134758,"tests\/views\/rules.php":4243984487,"tests\/views\/info.php":2307737612,"tests\/views\/intro.php":2326206089,"tests\/views\/database.php":2620345760,"tests\/views\/triggers.php":34451994,"tests\/views\/functions.php":2033820822,"tests\/views\/dbexport.php":116988704,"tests\/views\/sql.php":2133254966,"tests\/views\/display.php":1409704543,"tests\/views\/acinsert.php":2088764333,"tests\/views\/languages.php":415419170,"tests\/views\/views.php":3841965573,"tests\/views\/types.php":3442446936,"tests\/views\/conversions.php":463658754,"tests\/views\/users.php":1522379452,"tests\/views\/indexes.php":2985385536,"tests\/views\/login.php":859901983,"tests\/views\/tables.php":1835524831,"tests\/views\/servers.php":2170561429,"tests\/views\/tblproperties.php":2165251831,"tests\/views\/tablespaces.php":3660000394,"tests\/views\/privileges.php":989637477,"tests\/views\/casts.php":1784697523,"tests\/views\/sqledit.php":1950408374,"tests\/views\/fulltext.php":4254843051,"tests\/views\/browser.php":3386799217,"tests\/views\/colproperties.php":3654329162,"tests\/views\/roles.php":2501767529,"tests\/views\/groups.php":158295048,"tests\/views\/operators.php":3034060731,"tests\/views\/domains.php":1969031487,"tests\/views\/materializedviews.php":2674224540,"tests\/views\/history.php":2660614085,"tests\/views\/alldb.php":2331830236,"tests\/views\/opclasses.php":2978022429,"tests\/views\/constraints.php":2977577761,"tests\/views\/sequences.php":3267999321,"tests\/views\/schemas.php":2989318026,"tests\/views\/dataimport.php":583402277,"tests\/views\/help.php":1531107599,"tests\/views\/dataexport.php":2040255986,"tests\/views\/viewproperties.php":1871728533,"tests\/views\/aggregates.php":3226126213,"tests\/views\/materializedviewproperties.php":2875793023,"tests\/selenium\/src\/12-admin.php":2929296817,"tests\/selenium\/src\/01-roles.php":1942756297,"tests\/selenium\/src\/30-view.php":3095071001,"tests\/selenium\/src\/99-cleantests.php":1114238717,"tests\/selenium\/src\/15-sequence.php":1608733344,"tests\/selenium\/src\/20-constraint.php":3023139534,"tests\/selenium\/src\/25-column.php":1582574784,"tests\/selenium\/src\/06-schema.php":2971297019,"tests\/selenium\/src\/35-index.php":3092975528,"tests\/selenium\/src\/04-database.php":51860805,"tests\/selenium\/src\/10-table.php":837574512,"tests\/selenium\/src\/08-domaine.php":2475819178,"tests\/selenium\/testBuilder.class.php":890927907,"tests\/selenium\/TestSuite.php":2196993957}} \ No newline at end of file diff --git a/composer.json b/composer.json index 8d05ab428..ee929df50 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "huasofoundries/phppgadmin6", - "version": "6.0.0-beta.46", + "version": "6.0.0-beta.47", "description": "Like phpmyadmin but for postgres", "type": "project", "license": "MIT", diff --git a/composer.lock b/composer.lock index 0050e7710..2734ddfad 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "07f412fd6782da8dacff0ffeb0ae9710", + "content-hash": "100a6c5c64d93007af9aeaabd53994b9", "packages": [ { "name": "adodb/adodb-php", diff --git a/src/classes/ADONewConnection.php b/src/classes/ADONewConnection.php index 1b33db5f7..e3799b411 100644 --- a/src/classes/ADONewConnection.php +++ b/src/classes/ADONewConnection.php @@ -1,7 +1,7 @@ '; + $scripts = ''; - $scripts .= '' . "\n"; + $scripts .= ''."\n"; $footer_template = 'footer.twig'; $header_template = 'header.twig'; @@ -257,10 +257,10 @@ public function doBrowse($msg = '') //die(htmlspecialchars($query)); - echo '
'."\n"; + echo ''; } /** - * Performs actual edition of row + * Performs actual edition of row. */ public function doEditRow() { @@ -858,11 +857,12 @@ public function doEditRow() ); if (0 == $status) { return $this->doBrowse($this->lang['strrowupdated']); - } elseif ($status == -2) { + } + if ($status == -2) { return $this->formEditRow($this->lang['strrownotunique']); - } else { - return $this->formEditRow($this->lang['strrowupdatedbad']); } + + return $this->formEditRow($this->lang['strrowupdatedbad']); } /** @@ -880,58 +880,58 @@ public function doDelRow($confirm) $resultset = $data->browseRow($_REQUEST['table'], $_REQUEST['key']); - echo '{$this->lang['strconfdeleterow']}
" . "\n"; + echo "{$this->lang['strconfdeleterow']}
"."\n"; $fkinfo = []; echo '{$this->lang['strrownotunique']}
" . "\n"; - echo "lang['strcancel']}\" />" . "\n"; + echo "{$this->lang['strrownotunique']}
"."\n"; + echo "lang['strcancel']}\" />"."\n"; } else { - echo "{$this->lang['strinvalidparam']}
" . "\n"; - echo "lang['strcancel']}\" />" . "\n"; + echo "{$this->lang['strinvalidparam']}
"."\n"; + echo "lang['strcancel']}\" />"."\n"; } if (isset($_REQUEST['table'])) { - echo '' . "\n"; + echo ''."\n"; } if (isset($_REQUEST['subject'])) { - echo '' . "\n"; + echo ''."\n"; } if (isset($_REQUEST['query'])) { - echo '' . "\n"; + echo ''."\n"; } if (isset($_REQUEST['count'])) { - echo '' . "\n"; + echo ''."\n"; } if (isset($_REQUEST['return'])) { - echo '' . "\n"; + echo ''."\n"; } - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; + $result = '
'."\n"; if ($page != 1) { $result .= sprintf('%s%s ', $url, $lang['strfirst'], "\n"); $result .= sprintf('%s%s', $url, $page - 1, $lang['strprev'], "\n"); @@ -1091,7 +1091,7 @@ private function _printPages($page, $pages, $gets, $max_width = 20) list($min_page, $max_page) = $this->_getMinMaxPages($page, $pages); for ($i = $min_page; $i <= $max_page; ++$i) { - $result .= (($i === $page) ? $i : sprintf('%s', $url, $i, $i)) . "\n"; + $result .= (($i === $page) ? $i : sprintf('%s', $url, $i, $i))."\n"; } if ($page != $pages) { diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index 7cdc767d2..614308c36 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -1,7 +1,7 @@ [ 'title' => $this->lang['strtable'], 'field' => Decorator::field('relname'), - 'url' => \SUBFOLDER . "/redirect/table?{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/table?{$this->misc->href}&", 'vars' => ['table' => 'relname'], ], 'owner' => [ @@ -462,7 +462,7 @@ public function doCreate($msg = '') $this->printTitle($this->lang['strcreatetable'], 'pg.table.create'); $this->printMsg($msg); - echo '
{$this->lang['strname']} | \n"; @@ -528,8 +528,8 @@ public function doCreate($msg = '') $this->printTitle($this->lang['strcreatetable'], 'pg.table.create'); $this->printMsg($msg); - echo ''; - echo '
---|
\n"; echo "\t\t | \n"; + .(isset($_REQUEST['uniquekey'][$i]) ? ' checked="checked"' : '')." />\n"; echo "\t\t | \n"; + .(isset($_REQUEST['primarykey'][$i]) ? ' checked="checked"' : '') + ." />\n"; echo "\t\t | \n"; echo "\t\t | \n";
+ echo '
|