Merge pull request #28 from SpacePossum/master_cleanups

Clean ups
GeckoPackages · Nov 22, 2016 · 40a697e · 40a697e
2 parents f8e8ec4 + eb5d002
commit 40a697e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -12,6 +12,8 @@
 namespace GeckoPackages\PHPUnit\Constraints;
 
 /**
+ * @api
+ *
  * @author Dariusz Rumiński <[email protected]>
  */
 final class SameStringsConstraint extends \PHPUnit_Framework_Constraint_IsIdentical

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,8 @@ @@
     namespace GeckoPackages\PHPUnit\Constraints;
     /**
+     * @api
+     *
      * @author Dariusz Rumiński <[email protected]>
      */
     final class SameStringsConstraint extends \PHPUnit_Framework_Constraint_IsIdentical
@@ Expand Down @@