From d811344b953adab32cd8d7ffd5597d7dd69abd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Sat, 24 Oct 2020 12:57:14 +0200
Subject: [PATCH 1/5] Improve CI config

---
 .travis.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33bfe58..96f869d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,24 +4,24 @@ language: php
 os:
   - linux
 dist: bionic
+
+addons:
+  apt:
+    packages:
+      - subversion
+
 services:
   - mysql
 
 php:
-  # TODO PHP 8.0
   - '7.4'
+  # TODO
+  #- '8.0'
 
 cache:
   directories:
     - '${HOME}/.composer/cache'
 
-# TODO maybe test building docs at some point
-
-addons:
-  apt:
-    packages:
-      - subversion
-
 before_install:
   - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
   - mysql -e 'GRANT ALL PRIVILEGES ON test.* TO test@localhost IDENTIFIED BY "test";'
@@ -31,6 +31,8 @@ install:
   - DB_HOST=127.0.0.1 DB_NAME=test DB_USER=test DB_PASS=test bin/install-wp-tests.sh
 
 script:
-  - vendor/bin/phpunit
-  - ./vendor/bin/phpcs --standard=./phpcs.xml test/unit test/integration src
-  - vendor/bin/phpstan analyse
+  - composer run-script test
+  - composer run-script sniff
+  - composer run-script phpstan
+  # TODO
+  #- composer run-script docs:build

From 009fa255fcc7293bad673cefccbd0c8f95450d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Sat, 24 Oct 2020 13:01:33 +0200
Subject: [PATCH 2/5] Update phpcs.xml

---
 phpcs.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/phpcs.xml b/phpcs.xml
index 222ced3..4a10528 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,20 +4,16 @@
 
     <arg name="tab-width" value="2" />
 
-		<config name="installed_paths" value="vendor/wp-coding-standards/wpcs" />
+    <config name="installed_paths" value="vendor/wp-coding-standards/wpcs" />
 
-    <!--
-        Default settings for command line usage
-    -->
-
-    <!-- Exclude folders and files from being checked. -->
+    <!-- What files to check. -->
+    <file>./src/</file>
+    <file>./test/unit/</file>
+    <file>./test/integration/</file>
     <exclude-pattern>wp-content/</exclude-pattern>
     <exclude-pattern>wp/</exclude-pattern>
-    <exclude-pattern>vendor/*</exclude-pattern>
-    <exclude-pattern>test/themes</exclude-pattern>
-
-    <!-- If no files or directories are specified on the command line, check all relevant files. -->
-    <file>./lib</file>
+    <exclude-pattern>vendor/</exclude-pattern>
+    <exclude-pattern>test/themes/</exclude-pattern>
 
     <!-- Use colors in output. -->
     <arg name="colors"/>

From 6dc8248958b8fa016ae7f2cf209535c26f918a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Sat, 24 Oct 2020 13:04:38 +0200
Subject: [PATCH 3/5] Update .travis.yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 96f869d..9637293 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ cache:
 before_install:
   - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
   - mysql -e 'GRANT ALL PRIVILEGES ON test.* TO test@localhost IDENTIFIED BY "test";'
+  - composer self-update --1
 
 install:
   - composer install --no-interaction --prefer-dist

From 3efcc359eb5769342b37b77c25300ff533f1d11d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Sat, 24 Oct 2020 13:22:46 +0000
Subject: [PATCH 4/5] Check CS of ./greg.php

---
 phpcs.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpcs.xml b/phpcs.xml
index 4a10528..29ce6d4 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,7 @@
     <config name="installed_paths" value="vendor/wp-coding-standards/wpcs" />
 
     <!-- What files to check. -->
+    <file>./greg.php</file>
     <file>./src/</file>
     <file>./test/unit/</file>
     <file>./test/integration/</file>

From 131baa59fa018b0e7b5a79d6c31f17d92b80e08e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Mon, 26 Oct 2020 17:29:38 +0000
Subject: [PATCH 5/5] Fix just a couple vestiges

---
 .travis.yml | 2 --
 phpcs.xml   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9637293..a3cd322 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,5 +35,3 @@ script:
   - composer run-script test
   - composer run-script sniff
   - composer run-script phpstan
-  # TODO
-  #- composer run-script docs:build
diff --git a/phpcs.xml b/phpcs.xml
index 29ce6d4..1c356c4 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -14,7 +14,6 @@
     <exclude-pattern>wp-content/</exclude-pattern>
     <exclude-pattern>wp/</exclude-pattern>
     <exclude-pattern>vendor/</exclude-pattern>
-    <exclude-pattern>test/themes/</exclude-pattern>
 
     <!-- Use colors in output. -->
     <arg name="colors"/>