Merge pull request #21 from liam-wiltshire/ci-tidyup

liam-wiltshire · web-flow · commit 41f78f0cc99b · 2019-10-21T20:17:37.000+01:00
Tidy up CI config
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,7 +31,5 @@ jobs:
             - ./vendor
 
       # run tests with phpunit
-      - run: ./vendor/bin/phpunit
-      - run: ./vendor/bin/phpcs --standard=PSR2 src/
-      - run: php tests/CoverageCheck.php tests/clover.xml 95
+      - run: composer test
 
diff --git a/composer.json b/composer.json
@@ -27,8 +27,11 @@
 		}
 	},
 	"scripts": {
-		"test": "phpunit",
-		"cs": "php-cs-fixer fix src/ --level=psr2"
+    "test": [
+      "./vendor/bin/phpunit",
+      "./vendor/bin/phpcs --standard=PSR2 src/",
+      "php tests/CoverageCheck.php tests/clover.xml 95"
+    ]
 	},
 	"minimum-stability": "stable"
 }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,11 @@`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`"scripts": {`
`30`		`- "test": "phpunit",`
`31`		`- "cs": "php-cs-fixer fix src/ --level=psr2"`
	`30`	`+ "test": [`
	`31`	`+ "./vendor/bin/phpunit",`
	`32`	`+ "./vendor/bin/phpcs --standard=PSR2 src/",`
	`33`	`+ "php tests/CoverageCheck.php tests/clover.xml 95"`
	`34`	`+ ]`
`32`	`35`	`},`
`33`	`36`	`"minimum-stability": "stable"`
`34`	`37`	`}`