From 77836dc739c4b53ff9bf385a27553af1d18f32d9 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 20 Nov 2017 17:10:31 +0000
Subject: [PATCH] Adding phpcs to travis-ci
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squashed commit of the following:

commit 5b958d42bcfdce94e742d9602217818c398fb993
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 20 15:56:54 2017 +0000

    pyrus has been dropped by travis, even thouhgt its still in the docs

commit 33cb7ac72ad16af3df2c7a10daeb99fbe3b0a08c
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 20 15:45:14 2017 +0000

    Use pyrus/pear2 to install phpcs, and configure with phpcs.xml

commit 9781b036681e28ab9bb85f7a060e26d061118685
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 20 14:51:44 2017 +0000

    Fix phpcs issues

commit b165cd2a133113138a24c72a5df320a6ad397dac
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 20 13:48:18 2017 +0000

    Let’s read the whole travis help doc

commit e0f84ed388a83350fd76ac8586291a57c65df6c7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 20 13:44:55 2017 +0000

    Try adding phpcs to travis
---
 .travis.yml                      | 2 ++
 app/Services/BookmarkService.php | 3 +--
 app/Services/LikeService.php     | 3 +--
 phpcs.xml                        | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 phpcs.xml

diff --git a/.travis.yml b/.travis.yml
index 7da6b2b6..8b6c8d20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,7 @@ before_install:
   - psql -U travis -c 'create database travis_ci_test'
   - psql -U travis -d travis_ci_test -c 'create extension postgis'
   - travis_retry composer self-update --preview
+  - pear install pear/PHP_CodeSniffer && phpenv rehash
 
 install:
   - if [[ $setup = 'basic' ]];  then travis_retry composer install --no-interaction --prefer-dist; fi
@@ -67,5 +68,6 @@ before_script:
 
 script:
   - php vendor/bin/phpunit --coverage-text
+  - phpcs
   #- php artisan dusk
   - php vendor/bin/security-checker security:check ./composer.lock --end-point=http://security.sensiolabs.org/check_lock
diff --git a/app/Services/BookmarkService.php b/app/Services/BookmarkService.php
index 18280df1..c8215f1a 100644
--- a/app/Services/BookmarkService.php
+++ b/app/Services/BookmarkService.php
@@ -31,8 +31,7 @@ class BookmarkService
             $content = $request->input('properties.content.0');
             $categories = $request->input('properties.category');
         }
-        if (
-            ($request->header('Content-Type') == 'application/x-www-form-urlencoded')
+        if (($request->header('Content-Type') == 'application/x-www-form-urlencoded')
             ||
             (str_contains($request->header('Content-Type'), 'multipart/form-data'))
         ) {
diff --git a/app/Services/LikeService.php b/app/Services/LikeService.php
index d4ff6f76..a51fc509 100644
--- a/app/Services/LikeService.php
+++ b/app/Services/LikeService.php
@@ -21,8 +21,7 @@ class LikeService
             //micropub request
             $url = normalize_url($request->input('properties.like-of.0'));
         }
-        if (
-            ($request->header('Content-Type') == 'x-www-url-formencoded')
+        if (($request->header('Content-Type') == 'x-www-url-formencoded')
             ||
             ($request->header('Content-Type') == 'multipart/form-data')
         ) {
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 00000000..141a41f6
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="jonnybarnes.uk">
+    <description>Custom configuration for code running jonnybarnes.uk</description>
+    <file>./app/</file>
+    <rule ref="PSR2">
+        <exclude name="PSR2.Namespaces.UseDeclaration" />
+    </rule>
+</ruleset>