diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 9ce8fde880..f91b3c5b61 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2635,6 +2635,11 @@ parameters: count: 3 path: libraries/classes/Core.php + - + message: "#^Parameter \\#1 \\$name of method Symfony\\\\Component\\\\DependencyInjection\\\\Container\\:\\:setParameter\\(\\) expects string, \\(int\\|string\\) given\\.$#" + count: 1 + path: libraries/classes/Core.php + - message: "#^Parameter \\#1 \\$pattern of function preg_match expects string, mixed given\\.$#" count: 1 @@ -2650,6 +2655,11 @@ parameters: count: 1 path: libraries/classes/Core.php + - + message: "#^Parameter \\#2 \\$subject of function preg_match expects string, \\(int\\|string\\) given\\.$#" + count: 1 + path: libraries/classes/Core.php + - message: "#^Method PhpMyAdmin\\\\CreateAddField\\:\\:getIndexedColumns\\(\\) return type has no value type specified in iterable type array\\.$#" count: 5 @@ -3757,7 +3767,7 @@ parameters: - message: "#^Cannot access offset string on mixed\\.$#" - count: 2 + count: 3 path: libraries/classes/FlashMessages.php - @@ -3937,7 +3947,7 @@ parameters: - message: "#^Cannot access offset 'inner' on mixed\\.$#" - count: 4 + count: 5 path: libraries/classes/Gis/GisMultiPolygon.php - @@ -3997,7 +4007,7 @@ parameters: - message: "#^Cannot access offset mixed on mixed\\.$#" - count: 2 + count: 6 path: libraries/classes/Gis/GisMultiPolygon.php - @@ -5782,7 +5792,7 @@ parameters: - message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#" - count: 7 + count: 10 path: libraries/classes/Plugins/Import/ImportOds.php - @@ -5870,6 +5880,11 @@ parameters: count: 1 path: libraries/classes/Plugins/Import/ImportOds.php + - + message: "#^Cannot access offset 0 on array\\|bool\\.$#" + count: 1 + path: libraries/classes/Plugins/Import/ImportShp.php + - message: "#^Cannot access offset 0 on mixed\\.$#" count: 1 @@ -6172,7 +6187,7 @@ parameters: - message: "#^Cannot access offset mixed on mixed\\.$#" - count: 8 + count: 12 path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - @@ -6262,7 +6277,7 @@ parameters: - message: "#^Cannot access offset string on mixed\\.$#" - count: 4 + count: 6 path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php - @@ -6490,6 +6505,11 @@ parameters: count: 1 path: libraries/classes/Plugins/TwoFactor/Key.php + - + message: "#^Cannot access offset mixed on mixed\\.$#" + count: 1 + path: libraries/classes/Plugins/TwoFactor/Key.php + - message: "#^Parameter \\#1 \\$registrations of static method CodeLts\\\\U2F\\\\U2FServer\\\\U2FServer\\:\\:makeAuthentication\\(\\) expects array\\, array\\ given\\.$#" count: 1 @@ -6931,7 +6951,7 @@ parameters: path: libraries/classes/ResponseRenderer.php - - message: "#^Casting to array\\ something that's already array\\\\.$#" + message: "#^Casting to array something that's already array\\.$#" count: 4 path: libraries/classes/Sanitize.php @@ -7257,7 +7277,7 @@ parameters: - message: "#^Possibly invalid array key type array\\\\|string\\|null\\.$#" - count: 1 + count: 3 path: libraries/classes/Server/Privileges.php - @@ -7265,6 +7285,11 @@ parameters: count: 1 path: libraries/classes/Server/Privileges.php + - + message: "#^Possibly invalid array key type array\\\\|string\\|null\\.$#" + count: 1 + path: libraries/classes/Server/Privileges.php + - message: "#^Access to an uninitialized property PhpMyAdmin\\\\Server\\\\Status\\\\Data\\:\\:\\$config\\.$#" count: 1 @@ -7337,7 +7362,7 @@ parameters: - message: "#^Cannot access offset mixed on mixed\\.$#" - count: 5 + count: 10 path: libraries/classes/Server/Status/Monitor.php - @@ -8915,6 +8940,11 @@ parameters: count: 1 path: test/classes/Gis/GisMultiPolygonTest.php + - + message: "#^Cannot access offset 0 on mixed\\.$#" + count: 1 + path: test/classes/Gis/GisMultiPolygonTest.php + - message: "#^Cannot access offset 'no_of_points' on mixed\\.$#" count: 1 diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss index 25ce655de2..cd76247575 100644 --- a/public/themes/bootstrap/scss/_common.scss +++ b/public/themes/bootstrap/scss/_common.scss @@ -1225,7 +1225,6 @@ input#auto_increment_opt { position: fixed; top: 100px !important; width: 100%; - background: $white; } #table_columns { diff --git a/public/themes/bootstrap/scss/_designer.scss b/public/themes/bootstrap/scss/_designer.scss index 5790e691b2..7a7a3a41e7 100644 --- a/public/themes/bootstrap/scss/_designer.scss +++ b/public/themes/bootstrap/scss/_designer.scss @@ -16,6 +16,10 @@ $resize-img: '../img/designer/resize.png'; .input_tab { background-color: #a6c7e1; color: $black; + + .table { + background-color: var(--bs-body-bg); + } } .content_fullscreen { @@ -45,15 +49,15 @@ canvas.designer { } .designer_tab { - background-color: $white; - color: $black; + background-color: var(--bs-tertiary-bg); + color: var(--bs-tertiary-color); border-collapse: collapse; - border: 1px solid #aaa; + border: 1px solid var(--bs-border-color); z-index: 1; user-select: none; .header { - background: linear-gradient(#b8e6fa, #b8e6fa 6%, #cdf5fd 10%, #dbffff 10%, #9bd2f6 50%, #9bd2f6 100%); + background: var(--bs-primary-bg-subtle); } } @@ -65,7 +69,6 @@ canvas.designer { } .tab_zag_2 { - background: linear-gradient(#fffa96 0%, #fffa96 39%, #ffe796 40%, #ffe796 100%); text-align: center; cursor: move; padding: 1px; @@ -73,26 +76,20 @@ canvas.designer { } .tab_field { - background: $white; - color: $black; cursor: default; &:hover { - background-color: #cfc; - color: $black; background-repeat: repeat-x; cursor: default; } } .tab_field_3 { - background-color: #ffe6e6; - color: $black; + background-color: var(--bs-info-bg-subtle); + color: var(--bs-info-text-emphasis); cursor: default; &:hover { - background-color: #cfc; - color: $black; background-repeat: repeat-x; cursor: default; } @@ -160,15 +157,10 @@ canvas.designer { padding-right: 2px; cursor: default; width: 1px; - color: $black; - background: linear-gradient(#b8e6fa, #b8e6fa 6%, #cdf5fd 10%, #dbffff 10%, #9bd2f6 50%, #9bd2f6 100%); } .small_tab { vertical-align: top; - background-color: #0064ea; - color: $white; - background-image: url($small-tab-img); cursor: default; text-align: center; font-weight: bold; @@ -179,8 +171,6 @@ canvas.designer { &:hover { vertical-align: top; - color: $white; - background-color: #f96; cursor: default; padding-left: 2px; padding-right: 2px; @@ -192,14 +182,11 @@ canvas.designer { } .small_tab_pref { - background: linear-gradient(#b8e6fa, #b8e6fa 6%, #cdf5fd 10%, #dbffff 10%, #9bd2f6 50%, #9bd2f6 100%); text-align: center; width: 1px; &:hover { vertical-align: top; - color: $white; - background-color: #f96; cursor: default; text-align: center; font-weight: bold; @@ -208,14 +195,6 @@ canvas.designer { } } -.butt { - border: #47a solid 1px; - font-weight: bold; - background-color: $white; - color: $black; - vertical-align: baseline; -} - .L_butt2_1 { padding: 1px; text-decoration: none; @@ -300,7 +279,6 @@ canvas.designer { float: left; margin: 3px 1px 4px; height: 20px; - border: 1px dotted $white; } .M_bord { @@ -324,21 +302,15 @@ canvas.designer { a { &.M_butt_Selected_down { - border: 1px solid #c0c0bb; - background-color: #9f9; - color: $black; + background-color: var(--bs-info-bg-subtle); &:hover { - border: 1px solid #09c; - background-color: #fe9; - color: $black; + background-color: var(--bs-body-bg); } } &.M_butt:hover { - border: 1px solid #09c; - background-color: #fe9; - color: $black; + background-color: var(--bs-body-bg); } } diff --git a/templates/database/designer/main.twig b/templates/database/designer/main.twig index 1696770540..8cbd895212 100644 --- a/templates/database/designer/main.twig +++ b/templates/database/designer/main.twig @@ -263,7 +263,7 @@ window.designerConfig = {{ designer_config|raw }}; - +
@@ -374,7 +374,7 @@ window.designerConfig = {{ designer_config|raw }}; - +
@@ -425,7 +425,7 @@ window.designerConfig = {{ designer_config|raw }}; - +
@@ -703,7 +703,7 @@ window.designerConfig = {{ designer_config|raw }}; - +
@@ -769,7 +769,7 @@ window.designerConfig = {{ designer_config|raw }}; - +
@@ -908,7 +908,7 @@ window.designerConfig = {{ designer_config|raw }}; - +
@@ -993,7 +993,7 @@ window.designerConfig = {{ designer_config|raw }}; - +