From 2206c6040e0e14170f4991e5ac2b229bf68a393c Mon Sep 17 00:00:00 2001 From: Chris Wilkinson Date: Thu, 20 Dec 2018 08:16:02 +0000 Subject: [PATCH 1/2] Allow standards installer 0.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4adb8d7..35077b4 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ }, "require": { "php": "^7.2", - "dealerdirect/phpcodesniffer-composer-installer": "^0.4", + "dealerdirect/phpcodesniffer-composer-installer": "^0.4 || ^0.5", "slevomat/coding-standard": "^4.8", "squizlabs/php_codesniffer": "^3.3.2" }, From ed37cdc0a3c9bb5140cb9a27cd71552b45358dd9 Mon Sep 17 00:00:00 2001 From: Chris Wilkinson Date: Thu, 20 Dec 2018 08:29:56 +0000 Subject: [PATCH 2/2] Update test for PHP_CodeSniffer 3.4 --- tests/cases/trait/one-per-file | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cases/trait/one-per-file b/tests/cases/trait/one-per-file index d7be58a..927de38 100644 --- a/tests/cases/trait/one-per-file +++ b/tests/cases/trait/one-per-file @@ -19,4 +19,5 @@ trait Bar ---MESSAGES--- 11:1 PSR1.Classes.ClassDeclaration.MultipleClasses +11:1 Squiz.Classes.ClassFileName.NoMatch ---