[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c11155: Update PHPDoc.

[Hugues Peccatte]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c11155e74479264b05fe6ac40e8b01d8a39b672a
      https://github.com/phpmyadmin/phpmyadmin/commit/c11155e74479264b05fe6ac40e8b01d8a39b672a
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-07-25 (Sat, 25 Jul 2015)

  Changed paths:
    M libraries/controllers/TableRelationController.class.php
    M libraries/controllers/TableSearchController.class.php
    M test/libraries/PMA_GIS_modifyQuery_test.php

  Log Message:
  -----------
  Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 56c07e6f35059d7314685fbbb6b006ea278c0a64
      https://github.com/phpmyadmin/phpmyadmin/commit/56c07e6f35059d7314685fbbb6b006ea278c0a64
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-07-25 (Sat, 25 Jul 2015)

  Changed paths:
    M libraries/relation.lib.php
    M libraries/replication_gui.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 122225451bb5f99dd17fa3876cb68e498f2ed790
      https://github.com/phpmyadmin/phpmyadmin/commit/122225451bb5f99dd17fa3876cb68e498f2ed790
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-07-25 (Sat, 25 Jul 2015)

  Changed paths:
    M libraries/sql-parser/src/Component.php
    M libraries/sql-parser/src/Components/Expression.php
    M libraries/sql-parser/src/Components/ExpressionArray.php
    M libraries/sql-parser/src/Components/FieldDefinition.php
    M libraries/sql-parser/src/Components/OrderKeyword.php
    M libraries/sql-parser/src/Components/SetOperation.php
    A libraries/sql-parser/src/Components/UnionKeyword.php
    M libraries/sql-parser/src/Contexts/ContextMySql50000.php
    M libraries/sql-parser/src/Contexts/ContextMySql50100.php
    M libraries/sql-parser/src/Contexts/ContextMySql50500.php
    M libraries/sql-parser/src/Contexts/ContextMySql50600.php
    M libraries/sql-parser/src/Contexts/ContextMySql50700.php
    M libraries/sql-parser/src/Parser.php
    M libraries/sql-parser/src/Statement.php
    M libraries/sql-parser/src/Statements/SelectStatement.php
    A libraries/sql-parser/src/Statements/TransactionStatement.php
    M libraries/sql-parser/src/Utils/Query.php
    M po/hy.po
    M po/ru.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c80734a0cb3e...122225451bb5