[phpMyAdmin Git] [phpmyadmin/sql-parser] 88baea: Handling merging formats arrays

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 88baea96a9fc46513c611212dbe9535b17b05d87
      https://github.com/phpmyadmin/sql-parser/commit/88baea96a9fc46513c611212dbe9535b17b05d87
  Author: Damian Dlugosz <bigfootdd at gmail.com>
  Date:   2016-12-30 (Fri, 30 Dec 2016)

  Changed paths:
    M src/Utils/Formatter.php
    M tests/Utils/FormatterTest.php

  Log Message:
  -----------
  Handling merging formats arrays


  Commit: f7e232d1bcc2a85a5291aae029eae37452705cd2
      https://github.com/phpmyadmin/sql-parser/commit/f7e232d1bcc2a85a5291aae029eae37452705cd2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M src/Utils/Formatter.php
    M tests/Utils/FormatterTest.php

  Log Message:
  -----------
  Merge pull request #111 from bigfoot90/formats-merging

Handling merging formats arrays


Compare: https://github.com/phpmyadmin/sql-parser/compare/f3c5add790a7...f7e232d1bcc2