aagh clean commits

Author: kermage

.aagh/pre-commit

@@ -0,0 +1,10 @@
+files=$(git diff --cached --name-only --diff-filter=ACM | { grep '.php$' || true; })
+[ -z "$files" ] && exit 0
+
+failed=$(composer run lint $files 2>&1 | grep 'FILE: ' | cut -d ' ' -f2 | tr '\n' ' ')
+[ -z "$failed" ] && exit 0
+
+echo >&2 "Files incorrectly formatted. Try running:"
+echo >&2 "  composer run fix $failed"
+
+exit 1

.gitattributes

@@ -1,5 +1,6 @@
 * text=auto
 
+.aagh export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 /.idea/
+/.vscode/
 /bin/
 /tests/

composer.json

@@ -40,7 +40,7 @@
 		]
 	},
 	"scripts": {
-		"lint": "phpcs --colors -p -s -v",
-		"fix": "phpcbf -p -v"
+		"lint": "phpcs",
+		"fix": "phpcbf"
 	}
 }

phpcs.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
-<ruleset name="Augment Types">
+<ruleset
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd"
+	name="Augment Types"
+>
 	<!-- Set a description for this ruleset. -->
 	<description>The code standard rules for Augment Types.</description>
 
 	<!-- Strip the file paths down to the relevant bit. -->
-	<arg name="basepath" value="./" />
+	<arg name="basepath" value="." />
 	<!-- A comma separated list of file extensions to check. -->
 	<arg name="extensions" value="php" />
 	<!-- Show sniff and progress. -->
@@ -17,21 +21,23 @@
 	<!-- What to scan. -->
 	<file>.</file>
 	<!-- Exclude the Composer Vendor directory. -->
-	<exclude-pattern>/vendor/</exclude-pattern>
-
-	<!-- Include the WordPress ruleset. -->
-	<rule ref="WordPress-Extra" />
-
-	<rule ref="WordPress.Files.FileName">
-		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
-		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
-	</rule>
+	<exclude-pattern>vendor</exclude-pattern>
 
 	<!-- Include PHP cross-version compatibility. -->
 	<config name="testVersion" value="5.6-" />
 	<!-- Include minimum supported WP version. -->
 	<config name="minimum_supported_wp_version" value="4.6" />
 
-	<!-- Include PHP Compatibility Coding Standard for WordPress. -->
+	<!-- Include PHP Compatibility Coding Standard. -->
 	<rule ref="PHPCompatibilityWP" />
+	<!-- Include the WordPress ruleset. -->
+	<rule ref="WordPress-Extra" />
+
+	<!-- Custom Rules -->
+	<rule ref="WordPress.Files">
+		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
+		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
+		<exclude name="PSR2.Methods.FunctionClosingBrace.SpacingBeforeClose" />
+		<exclude name="PSR2.Classes.ClassDeclaration.CloseBraceAfterBody" />
+	</rule>
 </ruleset>