Merge pull request #397 from wmde/revert-390-noVendor

JeroenDeDauw · JeroenDeDauw · commit ec6d81b054a3 · 2015-03-06T00:28:57.000+01:00
Revert "Don't access vendor/bin in composer ci"
diff --git a/composer.json b/composer.json
@@ -44,16 +44,16 @@
 		}
 	},
 	"scripts": {
-		"ci": [
-			"composer test",
-			"composer cs"
-		],
 		"test": [
 			"composer validate --no-interaction",
 			"phpunit"
 		],
 		"cs": [
-			"phpcs src/* tests/* --standard=phpcs.xml --extensions=php -sp"
+			"vendor/bin/phpcs src/* tests/* --standard=phpcs.xml --extensions=php -sp"
+		],
+		"ci": [
+			"composer test",
+			"composer cs"
 		]
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -44,16 +44,16 @@`
`44`	`44`	`}`
`45`	`45`	`},`
`46`	`46`	`"scripts": {`
`47`		`- "ci": [`
`48`		`- "composer test",`
`49`		`- "composer cs"`
`50`		`- ],`
`51`	`47`	`"test": [`
`52`	`48`	`"composer validate --no-interaction",`
`53`	`49`	`"phpunit"`
`54`	`50`	`],`
`55`	`51`	`"cs": [`
`56`		`- "phpcs src/* tests/* --standard=phpcs.xml --extensions=php -sp"`
	`52`	`+ "vendor/bin/phpcs src/* tests/* --standard=phpcs.xml --extensions=php -sp"`
	`53`	`+ ],`
	`54`	`+ "ci": [`
	`55`	`+ "composer test",`
	`56`	`+ "composer cs"`
`57`	`57`	`]`
`58`	`58`	`}`
`59`	`59`	`}`