diff --git a/CHANGELOG.md b/CHANGELOG.md index a6f6f77..0ee3674 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 2.0.0rc2 - TBD + +### Added + +- Nothing. + +### Changed + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- [#16](https://github.com/laminas/laminas-coding-standard/pull/16) fixes the placement of strict type declarations. + ## 2.0.0rc1 - 2020-01-06 ### Added diff --git a/src/LaminasCodingStandard/ruleset.xml b/src/LaminasCodingStandard/ruleset.xml index 39f1fa6..a3f1cb4 100644 --- a/src/LaminasCodingStandard/ruleset.xml +++ b/src/LaminasCodingStandard/ruleset.xml @@ -104,7 +104,14 @@ - + + + + + + + + diff --git a/test/expected-report.txt b/test/expected-report.txt index 3f1c1fb..cade5c8 100644 --- a/test/expected-report.txt +++ b/test/expected-report.txt @@ -3,16 +3,16 @@ PHP CODE SNIFFER REPORT SUMMARY ---------------------------------------------------------------------- FILE ERRORS WARNINGS ---------------------------------------------------------------------- -test/fixable/2.1.BasicCodingStandard.php 59 1 -test/fixable/2.2.Files.php 4 0 +test/fixable/2.1.BasicCodingStandard.php 48 1 +test/fixable/2.2.Files.php 6 0 test/fixable/2.3.Lines.php 35 0 test/fixable/2.4.IndentingAndSpacing.php 46 0 test/fixable/2.5.KeywordsAndTypes.php 13 0 test/fixable/2.6.Variables.php 3 0 test/fixable/2.7.Arrays.php 9 0 -test/fixable/3.DeclareNamespaceAndImport.php 15 0 +test/fixable/3.DeclareNamespaceAndImport.php 11 0 test/fixable/4.1.ExtendsAndImplements.php 5 0 -test/fixable/4.2.UsingTraits.php 5 0 +test/fixable/4.2.UsingTraits.php 4 0 test/fixable/4.3.PropertiesAndConstants.php 5 0 test/fixable/4.4.MethodsAndFunctions.php 26 0 test/fixable/4.5.MethodAndFunctionArguments.php 66 0 @@ -23,7 +23,7 @@ test/fixable/5.1.IfElseifElse.php 15 1 test/fixable/5.2.SwitchCase.php 11 0 test/fixable/5.3.WhileAndDoWhile.php 12 0 test/fixable/5.4.ForStructure.php 7 0 -test/fixable/5.5.ForEachStructure.php 12 0 +test/fixable/5.5.ForEachStructure.php 10 0 test/fixable/5.6.TryCatchFinally.php 9 0 test/fixable/5.ControlStructures.php 4 0 test/fixable/6.1.UnaryOperators.php 6 0 @@ -32,11 +32,11 @@ test/fixable/6.3.TernaryOperators.php 13 0 test/fixable/6.Operators.php 97 0 test/fixable/7.Closures.php 2 0 test/fixable/8.AnonymousClasses.php 1 0 -test/fixable/9.CommentingAndDocBlocks.php 22 0 +test/fixable/9.CommentingAndDocBlocks.php 21 0 ---------------------------------------------------------------------- -A TOTAL OF 584 ERRORS AND 2 WARNINGS WERE FOUND IN 30 FILES +A TOTAL OF 567 ERRORS AND 2 WARNINGS WERE FOUND IN 30 FILES ---------------------------------------------------------------------- -PHPCBF CAN FIX 494 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +PHPCBF CAN FIX 487 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ---------------------------------------------------------------------- diff --git a/test/fixable/2.2.Files.php b/test/fixable/2.2.Files.php index 0cd0dbc..3925786 100644 --- a/test/fixable/2.2.Files.php +++ b/test/fixable/2.2.Files.php @@ -2,6 +2,12 @@ declare(strict_types=1); +/** + * @see https://github.com/laminas/laminas-coding-standard for the canonical source repository + * @copyright https://github.com/laminas/laminas-coding-standard/blob/master/COPYRIGHT.md + * @license https://github.com/laminas/laminas-coding-standard/blob/master/LICENSE.md New BSD License + */ + namespace LaminasCodingStandardTest\fixed; class Files diff --git a/test/fixable/3.DeclareNamespaceAndImport.php b/test/fixable/3.DeclareNamespaceAndImport.php index 13964c3..9423614 100644 --- a/test/fixable/3.DeclareNamespaceAndImport.php +++ b/test/fixable/3.DeclareNamespaceAndImport.php @@ -1,7 +1,9 @@