From 39d79a18b0adcfeb616d90349b9eb314da379f0a Mon Sep 17 00:00:00 2001
From: Finlay Beaton <ofbeaton@gmail.com>
Date: Mon, 25 Feb 2019 17:04:38 -0500
Subject: [PATCH] exclude not except. how embarrassing.

---
 phpcs/granite-docs/ruleset.xml   | 2 +-
 phpcs/granite-syntax/ruleset.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpcs/granite-docs/ruleset.xml b/phpcs/granite-docs/ruleset.xml
index 771e1c5..d1024f6 100644
--- a/phpcs/granite-docs/ruleset.xml
+++ b/phpcs/granite-docs/ruleset.xml
@@ -39,7 +39,7 @@
     -->
     <!-- TODO: Create our own BlockComment class that allows single line variable hints for IDEs --> 
     <rule ref="Squiz.Commenting.BlockComment">
-      <except name="Squiz.Commenting.BlockComment.SingleLine"/>
+      <exclude name="Squiz.Commenting.BlockComment.SingleLine"/>
     </rule>    
     <!-- TODO: Create our own ClassComment class that has the tags we want to require -->
     <rule ref="Squiz.Commenting.ClassComment">
diff --git a/phpcs/granite-syntax/ruleset.xml b/phpcs/granite-syntax/ruleset.xml
index 42857db..47687ba 100644
--- a/phpcs/granite-syntax/ruleset.xml
+++ b/phpcs/granite-syntax/ruleset.xml
@@ -286,7 +286,7 @@
     <rule ref="Squiz.WhiteSpace.CastSpacing">
        <!-- let's try without these for PSR-12 adoption
        allow blank lines above catch, elseif, else
-       <except name="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose"/>
+       <exclude name="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose"/>
        -->        
     </rule>
     <!-- TODO: force blank line above multiple catch, elseif, else -->
@@ -296,14 +296,14 @@
     <rule ref="Squiz.WhiteSpace.FunctionClosingBraceSpace">
       <!-- TODO: We may want to require 0 spaces before close, this one wants 1 -->
       <!-- allow no blank lines before close -->
-      <except name="Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeClose"/>
+      <exclude name="Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeClose"/>
     </rule>    
     <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace"/>
     
     <!-- TODO: must allow no lines after class on last method of class -->    
     <rule ref="Squiz.WhiteSpace.FunctionSpacing">
       <!-- allow no lines after method class, for last method in class -->
-      <except name="Squiz.WhiteSpace.FunctionSpacing.AfterLast"/>
+      <exclude name="Squiz.WhiteSpace.FunctionSpacing.AfterLast"/>
     </rule>
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
     <rule ref="Squiz.WhiteSpace.MemberVarSpacing"/>