Branch: refs/heads/motranslator Home: https://github.com/phpmyadmin/sql-parser Commit: 7eebd40cef49caaaf5163febe5e2082f00cf76d0 https://github.com/phpmyadmin/sql-parser/commit/7eebd40cef49caaaf5163febe5e2... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-03 (Tue, 03 Jan 2017) Changed paths: M src/Statement.php Log Message: ----------- Fix checking return value from stripos Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bda11c8a47be03b2691c20f1249cb2ad633d691a https://github.com/phpmyadmin/sql-parser/commit/bda11c8a47be03b2691c20f1249c... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-03 (Tue, 03 Jan 2017) Changed paths: M src/Utils/Formatter.php Log Message: ----------- Make the code a bit more readable Do not misuse ternary erorr silence operator to check if variable is set. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 4aadd25334b9e5aa00e48af130122a7415905cea https://github.com/phpmyadmin/sql-parser/commit/4aadd25334b9e5aa00e48af13012... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-03 (Tue, 03 Jan 2017) Changed paths: M src/Utils/Formatter.php M tests/Utils/FormatterTest.php Log Message: ----------- Simplify rules merging We first sanitize the merged array and we can later use it without checking. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 0735432a80ceade3518ec13c1ba0814c7118f66e https://github.com/phpmyadmin/sql-parser/commit/0735432a80ceade3518ec13c1ba0... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-03 (Tue, 03 Jan 2017) Changed paths: M src/UtfString.php Log Message: ----------- Use mb_strlen(8bit) to get length in bytes The strlen might be messed up by mbstring overloading. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 082a1fad6c64f455ac42698cb9c7a08f0347a2c0 https://github.com/phpmyadmin/sql-parser/commit/082a1fad6c64f455ac42698cb9c7... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-03 (Tue, 03 Jan 2017) Changed paths: M tests/Components/Array2dTest.php Log Message: ----------- Add some missing assertions Signed-off-by: Michal Čihař <michal@cihar.com> Commit: e704f6be7968c047285962bb6735134333c68cf8 https://github.com/phpmyadmin/sql-parser/commit/e704f6be7968c047285962bb6735... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-03 (Tue, 03 Jan 2017) Changed paths: M src/Statement.php M src/UtfString.php M src/Utils/Formatter.php M tests/Components/Array2dTest.php M tests/Utils/FormatterTest.php Log Message: ----------- Merge branch 'master' into motranslator Compare: https://github.com/phpmyadmin/sql-parser/compare/eb2b165784d3...e704f6be7968