Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b29917eca5778b61dff701a6082060c83d3e6c5 https://github.com/phpmyadmin/phpmyadmin/commit/8b29917eca5778b61dff701a6082... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M .scrutinizer.yml R PMAStandard/Sniffs/Commenting/ClassCommentSniff.php R PMAStandard/Sniffs/Commenting/FileCommentSniff.php R PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php R PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php R PMAStandard/ruleset.xml M build.xml M composer.json M phpunit.xml.dist Log Message: ----------- Use coding standard from phpmyadmin/coding-standard It is way cleaner to have the coding standard separte and use it when checking. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: c2419ee951272b3006224f5a7727955780918a5f https://github.com/phpmyadmin/phpmyadmin/commit/c2419ee951272b3006224f5a7727... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M .scrutinizer.yml R PMAStandard/Sniffs/Commenting/ClassCommentSniff.php R PMAStandard/Sniffs/Commenting/FileCommentSniff.php R PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php R PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php R PMAStandard/ruleset.xml M build.xml M composer.json M phpunit.xml.dist Log Message: ----------- Merge branch 'QA_4_6' Commit: 04b5ae45ec6fecb89f774da2f65f6d153948323c https://github.com/phpmyadmin/phpmyadmin/commit/04b5ae45ec6fecb89f774da2f65f... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M composer.json Log Message: ----------- Move coding standard to dev requires Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ce745efb3dbf61ad99385a420eb12faa02e4cc4f https://github.com/phpmyadmin/phpmyadmin/commit/ce745efb3dbf61ad99385a420eb1... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M composer.json Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d019757f6412...ce745efb3dbf