[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 737280: Update PMAStandard as per PHP_CodeSniffer 2.x

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 737280161c22ae9b8fdc2124aa29254dddb1d639
      https://github.com/phpmyadmin/phpmyadmin/commit/737280161c22ae9b8fdc2124aa29254dddb1d639
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M PMAStandard/Sniffs/Commenting/ClassCommentSniff.php
    M PMAStandard/Sniffs/Commenting/FileCommentSniff.php
    M PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php
    R PMAStandard/Sniffs/Commenting/InlineCommentSniff.php
    R PMAStandard/Sniffs/Files/LineLengthSniff.php
    M PMAStandard/ruleset.xml

  Log Message:
  -----------
  Update PMAStandard as per PHP_CodeSniffer 2.x

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 85304fb7e3682008324b2ee5c43b83ac0b25688d
      https://github.com/phpmyadmin/phpmyadmin/commit/85304fb7e3682008324b2ee5c43b83ac0b25688d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M PMAStandard/Sniffs/Commenting/ClassCommentSniff.php
    M PMAStandard/Sniffs/Commenting/FileCommentSniff.php
    M PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php
    R PMAStandard/Sniffs/Commenting/InlineCommentSniff.php
    R PMAStandard/Sniffs/Files/LineLengthSniff.php
    M PMAStandard/ruleset.xml

  Log Message:
  -----------
  Merge commit '7372801'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f730b4ca7d36...85304fb7e368