Merge pull request #12 from wmde/change-docker-image

Change docker image
wmde · May 20, 2020 · 50cf29b · 50cf29b
2 parents 9a53f66 + 038f395
commit 50cf29b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ vendor/
 
 .idea/
 
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: php
 
 # php version to use for travis' composer & coverage
 php:
-  - 7.1
+  - 7.4
 
 services:
   - docker

diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -15,16 +15,16 @@ test: covers phpunit
 cs: phpcs stan
 
 phpunit:
-	docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpunit
+	docker-compose run --rm fun-validators ./vendor/bin/phpunit
 
 phpcs:
-	docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpcs
+	docker-compose run --rm fun-validators ./vendor/bin/phpcs
 
 stan:
-	docker-compose run --rm fun-validators-7.2 ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/
+	docker-compose run --rm fun-validators ./vendor/bin/phpstan analyse --level=1 --no-progress src/ tests/
 
 covers:
-	docker-compose run --rm fun-validators-7.2 ./vendor/bin/covers-validator
+	docker-compose run --rm fun-validators ./vendor/bin/covers-validator
 
 composer:
 	docker run --rm --interactive --tty --volume $(shell pwd):/app -w /app\

diff --git a/composer.json b/composer.json
@@ -6,12 +6,12 @@
 		"php": ">=7.2"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~7.0",
+		"phpunit/phpunit": "~8.0",
 		"ockcyp/covers-validator": "~1.0",
-		"squizlabs/php_codesniffer": "~3.0",
-		"slevomat/coding-standard": "~4.0",
-		"mediawiki/mediawiki-codesniffer": "~13.0",
-		"phpstan/phpstan": "^0.10"
+		"squizlabs/php_codesniffer": "~3.4",
+		"slevomat/coding-standard": "~4.4",
+		"mediawiki/mediawiki-codesniffer": "~30.0",
+		"phpstan/phpstan": "^0.11"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,12 +1,8 @@
 version: '2'
 
 services:
-  fun-validators-7.2:
-    build:
-      context: .
-      args:
-        PHP_VERSION: 7.2
+  fun-validators:
+    image: wikimediade/fundraising-frontend:dev
     volumes:
       - ./:/usr/src/app
     working_dir: /usr/src/app
-    image: wmde/fun-validators:7.2
diff --git a/phpcs.xml b/phpcs.xml
@@ -136,6 +136,7 @@
         <exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
         <exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket" />
         <exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine" />
+		<exclude name="PEAR.Functions.FunctionCallSignature.OpeningIndent" />
     </rule>
 
     <!-- Using 3rd party sniff while Squiz isn't there, yet. https://github.com/squizlabs/PHP_CodeSniffer/issues/911 -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ language: php @@
     # php version to use for travis' composer & coverage
     php:
-      - 7.1
+      - 7.4
     services:
       - docker
@@ Expand Down @@