Merge branch 'master' into report-memory-improvements

Conflicts:
	package.xml

Author: gsherwood

package.xml

@@ -14,8 +14,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2013-07-25</date>
- <time>14:04:00</time>
+ <date>2013-09-26</date>
+ <time>10:09:00</time>
  <version>
   <release>1.5.0RC4</release>
   <api>1.5.0RC4</api>
@@ -388,6 +388,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP" name="LineLengthSniff.php" role="php">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>
+        <file baseinstalldir="PHP" name="LowercasedFilenameSniff.php" role="php">
+         <tasks:replace from="@package_version@" to="version" type="package-info" />
+        </file>
         <file baseinstalldir="PHP" name="OneClassPerFileSniff.php" role="php">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>
@@ -608,6 +611,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP" name="LineLengthUnitTest.php" role="test">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>
+        <file baseinstalldir="PHP" name="LowercasedFilenameUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP" name="LowercasedFilenameUnitTest.php" role="test">
+         <tasks:replace from="@package_version@" to="version" type="package-info" />
+        </file>
         <file baseinstalldir="PHP" name="OneClassPerFileUnitTest.inc" role="test" />
         <file baseinstalldir="PHP" name="OneClassPerFileUnitTest.php" role="test">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
@@ -1195,6 +1202,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
         </file>
        </dir>
        <dir name="Methods">
+        <file baseinstalldir="PHP" name="FunctionCallSignatureSniff.php" role="php">
+         <tasks:replace from="@package_version@" to="version" type="package-info" />
+        </file>
         <file baseinstalldir="PHP" name="MethodDeclarationSniff.php" role="php">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>
@@ -1244,6 +1254,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
         </file>
        </dir>
        <dir name="Methods">
+        <file baseinstalldir="PHP" name="FunctionCallSignatureUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP" name="FunctionCallSignatureUnitTest.php" role="test">
+         <tasks:replace from="@package_version@" to="version" type="package-info" />
+        </file>
         <file baseinstalldir="PHP" name="MethodDeclarationUnitTest.inc" role="test" />
         <file baseinstalldir="PHP" name="MethodDeclarationUnitTest.php" role="test">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
@@ -2415,6 +2429,62 @@ http://pear.php.net/dtd/package-2.0.xsd">
       -- See CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php for an example
    </notes>
   </release>
+  <release>
+   <version>
+    <release>1.4.7</release>
+    <api>1.4.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2013-09-26</date>
+   <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD License</license>
+   <notes>
+    - Added report type --report=junit to show the error list in a JUnit compatible format
+      -- Thanks to Oleg Lobach for the contribution
+    - Added support for the PHP 5.4 callable type hint
+    - Fixed problem where some file content could be ignored when checking STDIN
+    - Version information is now printed when installed via composer or run from a Git clone (request #20050)
+    - The CSS tokenizer is now more reliable when encountering 'list' and 'break' strings
+    - Coding standard ignore comments can now appear instead doc blocks as well as inline comments
+      -- Thanks to Stuart Langley for the patch
+    - Generic LineLengthSniff now ignores SVN URL and Head URL comments
+      -- Thanks to Karl DeBisschop for the patch
+    - PEAR MultiLineConditionSniff now has a setting to specify how many spaces code should be indented
+      -- Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+      -- Thanks to Szabolcs Sulik for the patch
+    - PEAR MultiLineAssignmentSniff now has a setting to specify how many spaces code should be indented
+      -- Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+      -- Thanks to Szabolcs Sulik for the patch
+    - PEAR FunctionDeclarationSniff now has a setting to specify how many spaces code should be indented
+      -- Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+      -- Thanks to Szabolcs Sulik for the patch
+    - Squiz SwitchDeclarationSniff now has a setting to specify how many spaces code should be indented
+      -- Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+      -- Thanks to Szabolcs Sulik for the patch
+    - Squiz CSS IndentationSniff now has a setting to specify how many spaces code should be indented
+      -- Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+      -- Thanks to Hugo Fonseca for the patch
+    - Squiz and MySource File and Function comment sniffs now allow all tags and don't require a particular licence
+    - Squiz LowercaseStyleDefinitionSniff no longer throws errors for class names in nested style definitions
+    - Squiz ClassFileNameSniff no longer throws errors when checking STDIN
+    - Squiz CSS sniffs no longer generate errors for IE filters
+    - Squiz CSS IndentationSniff no longer sees comments as blank lines
+    - Squiz LogicalOperatorSpacingSniff now ignores whitespace at the end of a line
+    - Squiz.Scope.MethodScope.Missing error message now mentions 'visibility' instead of 'scope modifier'
+      -- Thanks to Renat Akhmedyanov for the patch
+    - Added support for the PSR2 multi-line arguments errata
+    - The PSR2 standard no longer throws errors for additional spacing after a type hint
+    - PSR UseDeclarationSniff no longer throws errors for USE statements inside TRAITs
+    - Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
+      -- Adds new error message for single-line arrays that end with a comma
+    - Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses
+    - Fixed bug #20043 : Mis-interpretation of Foo::class
+    - Fixed bug #20044 : PSR1 camelCase check does not ignore leading underscores
+    - Fixed bug #20045 : Errors about indentation for closures with multi-line 'use' in functions
+   </notes>
+  </release>
   <release>
    <version>
     <release>1.4.6</release>