Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser 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> Compare: https://github.com/phpmyadmin/sql-parser/compare/7eebd40cef49...4aadd25334b9