Merge pull request #22 from owncloud/code-style

implement ownCloud coding standard

.drone.yml

@@ -40,6 +40,12 @@ pipeline:
     commands:
       - make test-php-lint
 
+  owncloud-coding-standard:
+    image: owncloudci/php:7.1
+    pull: true
+    commands:
+      - make test-php-style
+
   build:
     image: owncloudci/php:7.1
     pull: true

.gitignore

@@ -1,4 +1,5 @@
 build
 /vendor/
 vendor-bin/**/vendor
-vendor-bin/**/composer.lock
+vendor-bin/**/composer.lock
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,12 @@
+<?php
+
+$config = new OC\CodingStandard\Config();
+
+$config
+    ->setUsingCache(true)
+    ->getFinder()
+    ->exclude('vendor')
+    ->exclude('vendor-bin')
+    ->in(__DIR__);
+
+return $config;

Makefile

@@ -15,6 +15,7 @@ all_src=$(src_dirs) $(src_files)
 
 # bin file definitions
 PHPLINT=php -d zend.enable_gc=0  vendor-bin/php-parallel-lint/vendor/bin/parallel-lint
+PHP_CS_FIXER=php -d zend.enable_gc=0 vendor-bin/owncloud-codestyle/vendor/bin/php-cs-fixer
 
 # start with displaying help
 .DEFAULT_GOAL := help
@@ -51,6 +52,16 @@ test-php-lint:             ## Run phan
 test-php-lint: vendor-bin/php-parallel-lint/vendor
 	$(PHPLINT) appinfo lib locking
 
+.PHONY: test-php-style
+test-php-style:            ## Run php-cs-fixer and check owncloud code-style
+test-php-style: vendor-bin/owncloud-codestyle/vendor
+	$(PHP_CS_FIXER) fix -v --diff --diff-format udiff --allow-risky yes --dry-run
+
+.PHONY: test-php-style-fix
+test-php-style-fix:        ## Run php-cs-fixer and fix code style issues
+test-php-style-fix: vendor-bin/owncloud-codestyle/vendor
+	$(PHP_CS_FIXER) fix -v --diff --diff-format udiff --allow-risky yes
+
 #
 # Dependency management
 #--------------------------------------
@@ -68,4 +79,10 @@ vendor-bin/php-parallel-lint/vendor: vendor/bamarni/composer-bin-plugin vendor-b
 	composer bin php-parallel-lint install --no-progress
 
 vendor-bin/php-parallel-lint/composer.lock: vendor-bin/php-parallel-lint/composer.json
-	@echo php-parallel-lint composer.lock is not up to date.
+	@echo php-parallel-lint composer.lock is not up to date.
+
+vendor-bin/owncloud-codestyle/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/owncloud-codestyle/composer.lock
+	composer bin owncloud-codestyle install --no-progress
+
+vendor-bin/owncloud-codestyle/composer.lock: vendor-bin/owncloud-codestyle/composer.json
+	@echo owncloud-codestyle composer.lock is not up to date.

vendor-bin/owncloud-codestyle/composer.json

@@ -0,0 +1,5 @@
+{
+  "require": {
+    "owncloud/coding-standard": "^1.0"
+  }
+}