November 2021 - Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 2c125f: Add basic unit test for Export\ExportController
by Maurício Meneghini Fauth 30 Nov '21

30 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2c125f0a87bfbde336903a503ebc7055b3452918 https://github.com/phpmyadmin/phpmyadmin/commit/2c125f0a87bfbde336903a503eb… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2021-11-30 (Tue, 11 November 2021) -03:00 Changed paths: A test/classes/Controllers/Export/ExportControllerTest.php M test/classes/Stubs/DbiDummy.php Log Message: ----------- Add basic unit test for Export\ExportController Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev>

1 0

[phpmyadmin/phpmyadmin] 58ad13: Translated using Weblate (Turkish)
by Burak Yavuz 28 Nov '21

28 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 58ad136ad2dfb6b1178482cc9dd749394b47a66c https://github.com/phpmyadmin/phpmyadmin/commit/58ad136ad2dfb6b1178482cc9dd… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2021-11-28 (Sun, 11 November 2021) +01:00 Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3413 of 3413 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/ Signed-off-by: Burak Yavuz <hitowerdigit(a)hotmail.com> Commit: 7f45bac5c44d927c7f91a605053be5497d530c0d https://github.com/phpmyadmin/phpmyadmin/commit/7f45bac5c44d927c7f91a605053… Author: dingo thirteen <dingo13(a)d404.nl> Date: 2021-11-28 (Sun, 11 November 2021) +01:00 Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3413 of 3413 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/nl/ Signed-off-by: dingo thirteen <dingo13(a)d404.nl> Commit: a3613529e207a1ac0412e450945c7ff66c5d5f4d https://github.com/phpmyadmin/phpmyadmin/commit/a3613529e207a1ac0412e450945… Author: Domen <mitenem(a)outlook.com> Date: 2021-11-28 (Sun, 11 November 2021) +01:00 Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 100.0% (3413 of 3413 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/ Signed-off-by: Domen <mitenem(a)outlook.com>

1 0

[phpmyadmin/phpmyadmin] 26fb7d: Translated using Weblate (Japanese)
by Masahiro Fujimoto 28 Nov '21

28 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 26fb7d0929d38e53326209b9ab53ddb2ea8be92c https://github.com/phpmyadmin/phpmyadmin/commit/26fb7d0929d38e53326209b9ab5… Author: Masahiro Fujimoto <mfujimot(a)gmail.com> Date: 2021-11-28 (Sun, 11 November 2021) +01:00 Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate (Japanese) Currently translated at 100.0% (3410 of 3410 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ja/ Signed-off-by: Masahiro Fujimoto <mfujimot(a)gmail.com> Commit: 66e1357846501d70780252bcc62ac841c03306d4 https://github.com/phpmyadmin/phpmyadmin/commit/66e1357846501d70780252bcc62… Author: Hosted Weblate <hosted(a)weblate.org> Date: 2021-11-28 (Sun, 11 November 2021) +01:00 Changed paths: M po/ja.po Log Message: ----------- Merge branch 'origin/master' into Weblate. [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/

1 0

[phpmyadmin/phpmyadmin] 95668e: Update po files
by phpMyAdmin bot 28 Nov '21

28 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 95668e9a6249a783c044072b69afa75f8bbf5054 https://github.com/phpmyadmin/phpmyadmin/commit/95668e9a6249a783c044072b69a… Author: phpMyAdmin bot <bot(a)phpmyadmin.net> Date: 2021-11-28 (Sun, 11 November 2021) +00:00 Changed paths: M po/af.po M po/am.po M po/ar.po M po/ar_LY.po M po/az.po M po/be.po M po/be(a)latin.po M po/ber.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/rcf.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/tzm.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot(a)phpmyadmin.net>

1 0

[phpmyadmin/phpmyadmin] b996e2: Fix pmahomme's outline buttons CSS
by Maurício Meneghini Fauth 27 Nov '21

27 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b996e22727b4961cb2a1960faaa8b93e8c62f989 https://github.com/phpmyadmin/phpmyadmin/commit/b996e22727b4961cb2a1960faaa… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2021-11-27 (Sat, 11 November 2021) -03:00 Changed paths: M themes/pmahomme/scss/_buttons.scss Log Message: ----------- Fix pmahomme's outline buttons CSS Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev>

1 0

[phpmyadmin/phpmyadmin] 56a832: Refactor DatabaseInterface.php (#17209)
by Kamil Tekiela 27 Nov '21

27 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 56a832948c06032237ea2c34d76691289159b499 https://github.com/phpmyadmin/phpmyadmin/commit/56a832948c06032237ea2c34d76… Author: Kamil Tekiela <tekiela246(a)gmail.com> Date: 2021-11-26 (Fri, 11 November 2021) -03:00 Changed paths: M libraries/classes/Bookmark.php M libraries/classes/Controllers/Server/Variables/GetVariableController.php M libraries/classes/Controllers/Server/Variables/SetVariableController.php M libraries/classes/Controllers/Table/FindReplaceController.php M libraries/classes/Database/CentralColumns.php M libraries/classes/Database/Designer/Common.php M libraries/classes/Database/Routines.php M libraries/classes/DatabaseInterface.php M libraries/classes/Dbal/DbalInterface.php M libraries/classes/Normalization.php M libraries/classes/Plugins/Export/ExportMediawiki.php M libraries/classes/Plugins/Import/ImportCsv.php M libraries/classes/Profiling.php M libraries/classes/Relation.php M libraries/classes/Server/Privileges.php M libraries/classes/StorageEngine.php M libraries/classes/Table.php M libraries/classes/UserPreferences.php M psalm-baseline.xml M test/classes/Plugins/Export/ExportXmlTest.php M test/classes/TableTest.php M test/classes/UserPreferencesTest.php Log Message: ----------- Refactor DatabaseInterface.php (#17209) * Use str_starts_with() Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant !empty() !empty() on a declared variable is redundant. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Replace loop with array_column() Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Simpify assignment by removing temporary variable Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant if statements and array_merge Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove temporary variable Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Unindent code Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Add helper method fetchByMode() This is done to avoid calling methods through variables. It is the same in terms of performance. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Move if statements to where they are relevant I had a choice to either move the while loop out of the if statements or move the if statements inside. I decided it made more sense to move them inside. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Add NULL to phpdoc for the two parameters that can be null Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Simplify return statement Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Improve performance and simplify code Since we are always using STORE mode then we can use data_seek() method. This will allow us to get rid of the loop and use fetchByMode() method. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Inline value defaulting Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant check Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * [bugfix] getColumnNames() should return an array of strings There were multiple issues here. If we are selecting only a certain column from the SQL then let's use the handy function instead of array_keys. We will never get anything other than an array so checking if it is not an array makes no sense. Returning null only to cast it to an array is pointless. If really necessary, we could still check for an empty array. The ColumnController returned the value without even casting it to an array. I am not sure how jQuery/JavaScript dealt with it. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getColumnMapFromSql and add type hint Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getVirtualTables Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant loop Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant usage of freeResult() If there was no chance for the object to leak the scope and it is the end of the scope then there's no reason to call this method. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Replace dynamic variable with declare one It's always the same name. If we were creating more than one, we could use associative array, but in this case there seems to be absolutely no need for any of this. Dynamic variables make it harder to debug the code. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Update psalm-baseline.xml Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Widen the condition per williamdes suggestion This will allow value such as '' and '0' to pass through. Previously `if(! empty($database))` and `if($database)` dissallowed them. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * fetchResult() should return only arrays Tests fixed to return arrays. Non-empty in case of true, empty in case of false. Fixed a lot of Psalm issues where the condition was always true. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 3a3bb2: Fix tryMultiQuery signature
by Kamil Tekiela 26 Nov '21

26 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3a3bb2dc29db8815370cea757f238b1463e9010b https://github.com/phpmyadmin/phpmyadmin/commit/3a3bb2dc29db8815370cea757f2… Author: Kamil Tekiela <tekiela246(a)gmail.com> Date: 2021-11-25 (Thu, 11 November 2021) +00:00 Changed paths: M libraries/classes/DatabaseInterface.php M libraries/classes/Dbal/DbalInterface.php M libraries/classes/Dbal/DbiExtension.php M psalm-baseline.xml M test/classes/Stubs/DbiDummy.php Log Message: ----------- Fix tryMultiQuery signature Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> Commit: 89fa3d2aeababd311de29815cf458a542e9d4ab5 https://github.com/phpmyadmin/phpmyadmin/commit/89fa3d2aeababd311de29815cf4… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2021-11-26 (Fri, 11 November 2021) -03:00 Changed paths: M libraries/classes/DatabaseInterface.php M libraries/classes/Dbal/DbalInterface.php M libraries/classes/Dbal/DbiExtension.php M psalm-baseline.xml M test/classes/Stubs/DbiDummy.php Log Message: ----------- Merge pull request #17205 from kamil-tekiela/Fix-tryMultiQuery-signature Fix tryMultiQuery signature

1 0

[phpmyadmin/phpmyadmin] 58d9bb: Refactor DatabaseInterface::getColumns()
by Kamil Tekiela 26 Nov '21

26 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 58d9bb4a32f691fdcc19f74fd09a7b42273c3f70 https://github.com/phpmyadmin/phpmyadmin/commit/58d9bb4a32f691fdcc19f74fd09… Author: Kamil Tekiela <tekiela246(a)gmail.com> Date: 2021-11-25 (Thu, 11 November 2021) +00:00 Changed paths: M libraries/classes/Controllers/Table/FindReplaceController.php M libraries/classes/Controllers/Table/SearchController.php M libraries/classes/Controllers/Table/Structure/ChangeController.php M libraries/classes/Controllers/Table/StructureController.php M libraries/classes/Controllers/Table/ZoomSearchController.php M libraries/classes/Database/CentralColumns.php M libraries/classes/DatabaseInterface.php M libraries/classes/Dbal/DbalInterface.php M libraries/classes/InsertEdit.php M libraries/classes/Normalization.php M libraries/classes/Plugins/Export/ExportSql.php M libraries/classes/Relation.php M libraries/classes/SqlQueryForm.php M libraries/classes/Tracker.php M psalm-baseline.xml M test/classes/InsertEditTest.php Log Message: ----------- Refactor DatabaseInterface::getColumns() Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> Commit: 400c9e1d93bc220438cd2bb6d97fda1d08a4ddae https://github.com/phpmyadmin/phpmyadmin/commit/400c9e1d93bc220438cd2bb6d97… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2021-11-26 (Fri, 11 November 2021) -03:00 Changed paths: M libraries/classes/Controllers/Table/FindReplaceController.php M libraries/classes/Controllers/Table/SearchController.php M libraries/classes/Controllers/Table/Structure/ChangeController.php M libraries/classes/Controllers/Table/StructureController.php M libraries/classes/Controllers/Table/ZoomSearchController.php M libraries/classes/Database/CentralColumns.php M libraries/classes/DatabaseInterface.php M libraries/classes/Dbal/DbalInterface.php M libraries/classes/InsertEdit.php M libraries/classes/Normalization.php M libraries/classes/Plugins/Export/ExportSql.php M libraries/classes/Relation.php M libraries/classes/SqlQueryForm.php M libraries/classes/Tracker.php M psalm-baseline.xml M test/classes/InsertEditTest.php Log Message: ----------- Merge pull request #17204 from kamil-tekiela/Refactor-DatabaseInterface-getColumns() Refactor DatabaseInterface::getColumns()

1 0

[phpmyadmin/phpmyadmin] 8b2286: Fix some failing tests
by Maurício Meneghini Fauth 26 Nov '21

26 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b2286bdc9ea73353d731cab3c888df942dbb642 https://github.com/phpmyadmin/phpmyadmin/commit/8b2286bdc9ea73353d731cab3c8… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2021-11-26 (Fri, 11 November 2021) -03:00 Changed paths: M libraries/classes/InsertEdit.php M psalm-baseline.xml M templates/home/index.twig M test/selenium/ImportTest.php Log Message: ----------- Fix some failing tests Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev>

1 0

[phpmyadmin/phpmyadmin] 22a6fc: Minor refactoring of InsertEdit.php (#17199)
by Kamil Tekiela 26 Nov '21

26 Nov '21

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 22a6fc9045635907f581975d2c9e86aa328b5395 https://github.com/phpmyadmin/phpmyadmin/commit/22a6fc9045635907f581975d2c9… Author: Kamil Tekiela <tekiela246(a)gmail.com> Date: 2021-11-26 (Fri, 11 November 2021) -03:00 Changed paths: M libraries/classes/Controllers/Table/ReplaceController.php M libraries/classes/InsertEdit.php M phpstan-baseline.neon M psalm-baseline.xml M test/classes/InsertEditTest.php Log Message: ----------- Minor refactoring of InsertEdit.php (#17199) * Simplify condition isset is not needed since the variable is set and we check explicitely for an array so it cannot be null either. !empty is not needed because the variable is set, so we just need to check if it has non-empty value Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Reduce indentation thanks to early returns Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Collapse isset check Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant variable assignments $specialCharsEncoded is immediately overwritten in if/else. $noSupportTypes is always empty and never used in this code. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant !empty() checks on parameters and defined variables if(!empty($var)) on defined variables is redundant and equivalent to if($var) Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant ternary $dispval is declared to be a string so the ternary is redundant Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor showEmptyResultMessageOrSetUniqueCondition Replace boolean variable with returns, which leads to redundant else block. Remove redundant unset, which leads to redundant variable assignment. The return statement can be replaced with a boolean cast. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant unset at the end of the method When a variable leaves scope it is automatically unset Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * [RISKY] Remove temporary var and error supression It's risky because I was not able to determine the purpose of the error suppression. In case of error, the function seems to return -1, but that has not been checked here either. It was possible to silence undefined global variable, but in that case, why was it not done only on that one line? Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant condition The variable is declared as int|false so if it is not false and not 0, the only logical choice is a non-zero integer, which is always true. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Misleading type hint leading to invalid unit tests According to DbiMysqli the first argument should be mysqli_result. The correct type hint cannot be array. It can be object though. Tested with a debugger that the passed value is really mysqli_result. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove dead code Remove $inputType. I left the comemnt for posterity, but the variable is dead. If in the future someone decides to implement it again, then introducing the variable will not be a problem. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Move block of code to where it should be I am not sure about this block of code. I don't fully understand what it is supposed to do. However, making the query at the start of the function doesn't make sense to me. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Use array_keys instead of foreach with dummy variable Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Use is_null instead of isset True conditions are easier to read than inverted conditions. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant variable and break When the loop breaks then the variable is true. When the loop finishes then the variable is false. We can simply replace it with return true/false to make it simpler. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Add type declarations Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getEnumSetAndTimestampColumns Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant condition According to searchColumnInForeigners $foreigner is dependant on values from $foreigners which makes this check redundant. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getColumnEnumValues Simplify parameter list, add psalm types, and simplify code Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getColumnSetValueAndSelectSize Unfortunately, I cannot type hint the return value as then I would have to type-hint the param as well. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove ternary operator Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getSelectOptionForUpload Added types, removed NULL return (it is only outputted in Twig as HTML string so NULL made no sense), and simpified parameters. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getMaxUploadSize According to getMaxUploadSize the value can only be int. Comparisons of numerical strings should be avoided. Psalm return type can be added with the exact types. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getColumnSize It takes a string as a second parameter now. The reason for this is that during normal execution, the value comes from column specifier e.g. VARCHAR(255), which is a string. The value in spec_in_brackets could also represent ENUM/SET values, so it can't be forced as an int. This change required changing tests to pass a string instead of an array with an int. The behaviour should remain the same thanks to the (int) cast (previously implicit, now explicit). Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove parameter $realNullValue This parameter was always false. Instead define it as false inside each method. The methods are private, so this should not cause any problems. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Add psalm-return Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Add an early return and clarify return type This function should never return false Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Change return type to multidimensional array Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor getCommentsMap Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Type hint $tableColumns as multidimensional array This simplifies static analysis a little bit Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Update phpstan baseline Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Fix invalid unit test The method getTableColumns should return a multidimensional array always. Added proper type hint to avoid further mistakes and changed mock. According to my analysis this method should always return a multidimensional array because parameter $column to getColumns() is null. Also, this test is pretty useless as it just seems to test the bahaviour of array_values which behaves as an identity function right now. Note: The DBAL needs urgent refactoring too. I imagine array_values is redundant at the moment. The getColumns should only return a list or columns or a single column. There's no need to reindex the list. I think Psalm should have picked it up, but I didn't check. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove redundant call to Util::extractColumnSpec() Warning! There is no coverage in unit tests for this piece of code. While I have analysed the code flow manually, it is possible the duplicated call had some unknown to me purpose. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Update psalm-baseline.xml Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Adhere to the coding standard Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Revert "Remove ternary operator" This reverts commit 3cbec2cebb9efcc7d52988a5b5720c0e43dc6ddb. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Rename $field_MD5 to $fieldHashMd5 Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Exclude string '0' from comparison and invert the order of operation This helps with readability and it's unlikely that we would want to check for string '0' here. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Rename $spec_in_brackets to $specInBrackets Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove else statements Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Introduce array_key_exists() and a local variable We also add phpdoc comment telling static analysis that the value should be a string. This is what the current code expects already. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove object parameter type declaration Upon further inspection I realize this was wrong. The unit tests rely on the parameter type being an integer and so we cannot force it to be only an object. I leave the type hint as object as array was probably never the right type. Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com>

1 0