Renamed notEmpty into isNotEmpty, fixed class name of IsEmpty

norberttech · norberttech · commit c54376cac919 · 2016-01-24T21:28:59.000+01:00
diff --git a/README.md b/README.md
@@ -52,8 +52,8 @@ $match = $matcher->match("lorem ipsum dolor", "@string@")
 * ``isDateTime()``
 * ``isEmail()``
 * ``isUrl()``
-* ``notEmpty()``
 * ``isEmpty()``
+* ``isNotEmpty()``
 * ``lowerThan($boundry)``
 * ``greaterThan($boundry)``
 * ``inArray($value)``
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -4,7 +4,8 @@
 * ``Coduo\PHPMatcher\Matcher\CaptureMatcher`` was removed
 * ``Coduo\PHPMatcher\Matcher\TypeMatcher`` was removed 
 * ``Coduo\PHPMatcher\Matcher\PropertyMatcher`` interface was remved
-* Removed ``match`` function
+* Removed ``match`` function, use PHPMatcher facade instead
+* Renamed ``@pattern@.notEmpty()`` expander into ``@pattern@.isNotEmpty()``
 
 # Upgrade from 1.0 to 1.1
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsEmpty.php b/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsEmpty.php
@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
 use Coduo\ToString\StringConverter;
 
-final class isEmpty implements PatternExpander
+final class IsEmpty implements PatternExpander
 {
     private $error;
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsNotEmpty.php b/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsNotEmpty.php
@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
 use Coduo\ToString\StringConverter;
 
-final class NotEmpty implements PatternExpander
+final class IsNotEmpty implements PatternExpander
 {
     private $error;
 
diff --git a/src/Coduo/PHPMatcher/Parser/ExpanderInitializer.php b/src/Coduo/PHPMatcher/Parser/ExpanderInitializer.php
@@ -17,7 +17,7 @@ final class ExpanderInitializer
     private $expanderDefinitions = array(
         "startsWith" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\StartsWith",
         "endsWith" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\EndsWith",
-        "notEmpty" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\NotEmpty",
+        "isNotEmpty" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\IsNotEmpty",
         "isEmpty" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\IsEmpty",
         "isDateTime" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\IsDateTime",
         "isEmail" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\IsEmail",
diff --git a/tests/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsEmptyTest.php b/tests/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsEmptyTest.php
@@ -2,12 +2,12 @@
 
 namespace Coduo\PHPMatcher\Tests\Matcher\Pattern\Expander;
 
-use Coduo\PHPMatcher\Matcher\Pattern\Expander\isEmpty;
+use Coduo\PHPMatcher\Matcher\Pattern\Expander\IsEmpty;
 
 /**
  * @author Benjamin Lazarecki <benjamin.lazarecki@gmail.com>
  */
-class isEmptyTest extends \PHPUnit_Framework_TestCase
+class IsEmptyTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider examplesProvider
diff --git a/tests/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsNotEmptyTest.php b/tests/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsNotEmptyTest.php
@@ -3,16 +3,16 @@
 namespace Coduo\PHPMatcher\Tests\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher;
-use Coduo\PHPMatcher\Matcher\Pattern\Expander\NotEmpty;
+use Coduo\PHPMatcher\Matcher\Pattern\Expander\IsNotEmpty;
 
-class NotEmptyTest extends \PHPUnit_Framework_TestCase
+class IsNotEmptyTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider examplesProvider
      */
     public function test_examples_not_ignoring_case($value, $expectedResult)
     {
-        $expander = new NotEmpty();
+        $expander = new IsNotEmpty();
         $this->assertEquals($expectedResult, $expander->match($value));
     }
 
diff --git a/tests/Coduo/PHPMatcher/Matcher/StringMatcherTest.php b/tests/Coduo/PHPMatcher/Matcher/StringMatcherTest.php
@@ -70,7 +70,7 @@ public static function positiveMatchData()
     {
         return array(
             array("lorem ipsum", "@string@"),
-            array("lorem ipsum", "@string@.notEmpty()"),
+            array("lorem ipsum", "@string@.isNotEmpty()"),
             array("lorem ipsum", "@string@.startsWith('lorem')"),
             array("lorem ipsum", "@string@.endsWith('ipsum')"),
             array("lorem ipsum dolor", "@string@.startsWith('lorem').contains('ipsum').endsWith('dolor')"),
diff --git a/tests/Coduo/PHPMatcher/MatcherTest.php b/tests/Coduo/PHPMatcher/MatcherTest.php
@@ -238,8 +238,8 @@ public static function expanderExamples()
             array("lorem ipsum", "@string@.isUrl()", false),
             array("2014-08-19", "@string@.isDateTime()", true),
             array(100, "@integer@.lowerThan(101).greaterThan(10)", true),
-            array("", "@string@.notEmpty()", false),
-            array("lorem ipsum", "@string@.notEmpty()", true),
+            array("", "@string@.isNotEmpty()", false),
+            array("lorem ipsum", "@string@.isNotEmpty()", true),
             array("", "@string@.isEmpty()", true),
             array(array("foo", "bar"), "@array@.inArray(\"bar\")", true),
             array(array(), "@array@.isEmpty()", true),

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;`
`6`	`6`	`use Coduo\ToString\StringConverter;`
`7`	`7`
`8`		`-final class isEmpty implements PatternExpander`
	`8`	`+final class IsEmpty implements PatternExpander`
`9`	`9`	`{`
`10`	`10`	`private $error;`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,16 @@`
`3`	`3`	`namespace Coduo\PHPMatcher\Tests\Matcher\Pattern\Expander;`
`4`	`4`
`5`	`5`	`use Coduo\PHPMatcher\Matcher;`
`6`		`-use Coduo\PHPMatcher\Matcher\Pattern\Expander\NotEmpty;`
	`6`	`+use Coduo\PHPMatcher\Matcher\Pattern\Expander\IsNotEmpty;`
`7`	`7`
`8`		`-class NotEmptyTest extends \PHPUnit_Framework_TestCase`
	`8`	`+class IsNotEmptyTest extends \PHPUnit_Framework_TestCase`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`	`11`	`* @dataProvider examplesProvider`
`12`	`12`	`*/`
`13`	`13`	`public function test_examples_not_ignoring_case($value, $expectedResult)`
`14`	`14`	`{`
`15`		`- $expander = new NotEmpty();`
	`15`	`+ $expander = new IsNotEmpty();`
`16`	`16`	`$this->assertEquals($expectedResult, $expander->match($value));`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static function positiveMatchData()`
`70`	`70`	`{`
`71`	`71`	`return array(`
`72`	`72`	`array("lorem ipsum", "@string@"),`
`73`		`- array("lorem ipsum", "@string@.notEmpty()"),`
	`73`	`+ array("lorem ipsum", "@string@.isNotEmpty()"),`
`74`	`74`	`array("lorem ipsum", "@[email protected]('lorem')"),`
`75`	`75`	`array("lorem ipsum", "@[email protected]('ipsum')"),`
`76`	`76`	`array("lorem ipsum dolor", "@[email protected]('lorem').contains('ipsum').endsWith('dolor')"),`
-Original file line number
+Diff line change
             array("lorem ipsum", "@[email protected]()", false),
             array("2014-08-19", "@[email protected]()", true),
             array(100, "@[email protected](101).greaterThan(10)", true),
 -            array("", "@string@.notEmpty()", false),
 -            array("lorem ipsum", "@string@.notEmpty()", true),
 +            array("", "@string@.isNotEmpty()", false),
 +            array("lorem ipsum", "@string@.isNotEmpty()", true),
             array("", "@[email protected]()", true),
             array(array("foo", "bar"), "@[email protected](\"bar\")", true),
             array(array(), "@[email protected]()", true),