From eb5d002b67b66bab5e6eebaeabd6f08add941ed3 Mon Sep 17 00:00:00 2001 From: SpacePossum Date: Tue, 22 Nov 2016 11:55:30 +0100 Subject: [PATCH] clean ups --- .php_cs | 4 ++-- UPGRADE.md | 6 ------ .../Constraints/FilePermissionsIsIdenticalConstraint.php | 4 ++-- src/PHPUnit/Constraints/SameStringsConstraint.php | 2 ++ src/PHPUnit/Constraints/XML/XMLMatchesXSDConstraint.php | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.php_cs b/.php_cs index 397eff6..55bcff8 100644 --- a/.php_cs +++ b/.php_cs @@ -19,15 +19,15 @@ return Symfony\CS\Config\Config::create() 'combine_consecutive_unsets', 'ereg_to_preg', 'header_comment', - 'newline_after_open_tag', 'long_array_syntax', + 'newline_after_open_tag', 'no_useless_else', 'no_useless_return', 'ordered_use', - 'phpdoc_order', 'php_unit_construct', 'php_unit_dedicate_assert', 'php_unit_strict', + 'phpdoc_order', 'strict', 'strict_param', '-empty_return', diff --git a/UPGRADE.md b/UPGRADE.md index 529c55a..e0944f3 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -8,18 +8,12 @@ Traits (asserts) The `FileExistsTrait` has been renamed to `FileExistsAssertTrait`. -The `StringsAssertTrait` has been added. - The following methods have been moved from `ScalarAssertTrait` to `StringsAssertTrait`: - `assertStringIsEmpty` - `assertStringIsNotEmpty` - `assertStringIsNotWhiteSpace` - `assertStringIsWhiteSpace` -New methods have been added to `StringsAssertTrait`: -- `assertNotSameStrings` -- `assertSameStrings` - Constraints -------------- diff --git a/src/PHPUnit/Constraints/FilePermissionsIsIdenticalConstraint.php b/src/PHPUnit/Constraints/FilePermissionsIsIdenticalConstraint.php index c362d5f..5f929c9 100644 --- a/src/PHPUnit/Constraints/FilePermissionsIsIdenticalConstraint.php +++ b/src/PHPUnit/Constraints/FilePermissionsIsIdenticalConstraint.php @@ -12,10 +12,10 @@ namespace GeckoPackages\PHPUnit\Constraints; /** - * @api - * * @note Some code is derived from the example on PHP net (http://php.net/manual/en/function.fileperms.php) * + * @api + * * @author SpacePossum */ final class FilePermissionsIsIdenticalConstraint extends \PHPUnit_Framework_Constraint diff --git a/src/PHPUnit/Constraints/SameStringsConstraint.php b/src/PHPUnit/Constraints/SameStringsConstraint.php index 385c028..c9d9aa4 100644 --- a/src/PHPUnit/Constraints/SameStringsConstraint.php +++ b/src/PHPUnit/Constraints/SameStringsConstraint.php @@ -12,6 +12,8 @@ namespace GeckoPackages\PHPUnit\Constraints; /** + * @api + * * @author Dariusz RumiƄski */ final class SameStringsConstraint extends \PHPUnit_Framework_Constraint_IsIdentical diff --git a/src/PHPUnit/Constraints/XML/XMLMatchesXSDConstraint.php b/src/PHPUnit/Constraints/XML/XMLMatchesXSDConstraint.php index 647ff36..79cf410 100644 --- a/src/PHPUnit/Constraints/XML/XMLMatchesXSDConstraint.php +++ b/src/PHPUnit/Constraints/XML/XMLMatchesXSDConstraint.php @@ -16,7 +16,7 @@ * * @author SpacePossum */ -class XMLMatchesXSDConstraint extends AbstractXMLConstraint +final class XMLMatchesXSDConstraint extends AbstractXMLConstraint { /** * @var string