Fix method names and constants

Author: jsor

src/React/Promise/Deferred.php

@@ -28,7 +28,7 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
             };
         } else {
             if (null !== $progressHandler) {
-                trigger_error('Invalid $progressHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+                trigger_error('Invalid $progressHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
             }
 
             $progHandler = array($deferred, 'progress');

src/React/Promise/FulfilledPromise.php

@@ -19,7 +19,7 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
             if (is_callable($fulfilledHandler)) {
                 $result = call_user_func($fulfilledHandler, $result);
             } elseif (null !== $fulfilledHandler) {
-                trigger_error('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+                trigger_error('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
             }
 
             return Util::promiseFor($result);

src/React/Promise/RejectedPromise.php

@@ -16,7 +16,7 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
         try {
             if (!is_callable($errorHandler)) {
                 if (null !== $errorHandler) {
-                    trigger_error('Invalid $errorHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+                    trigger_error('Invalid $errorHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
                 }
 
                 return new RejectedPromise($this->reason);

tests/React/Promise/DeferredProgressTest.php

@@ -315,9 +315,9 @@ public function shouldAllowRejectAfterProgress()
 
     /**
      * @test
-     * @dataProvider typesDataProvider
+     * @dataProvider invalidCallbackDataProvider
      **/
-    public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var)
+    public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
     {
         $this->setErrorHandler();
 
@@ -342,7 +342,7 @@ public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var)
 
         $d->progress(1);
 
-        $this->assertError('Invalid $progressHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+        $this->assertError('Invalid $progressHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
         $this->restoreErrorHandler();
     }
 }

tests/React/Promise/DeferredRejectTest.php

@@ -88,9 +88,9 @@ public function shouldForwardReasonWhenCallbackIsNull()
 
     /**
      * @test
-     * @dataProvider typesDataProvider
+     * @dataProvider invalidCallbackDataProvider
      **/
-    public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var)
+    public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
     {
         $this->setErrorHandler();
 
@@ -113,7 +113,7 @@ public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var)
 
         $d->reject(1);
 
-        $this->assertError('Invalid $errorHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+        $this->assertError('Invalid $errorHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
         $this->restoreErrorHandler();
     }
 }

tests/React/Promise/DeferredResolveTest.php

@@ -165,9 +165,9 @@ public function shouldForwardValueWhenCallbackIsNull()
 
     /**
      * @test
-     * @dataProvider typesDataProvider
+     * @dataProvider invalidCallbackDataProvider
      **/
-    public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var)
+    public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
     {
         $this->setErrorHandler();
 
@@ -189,7 +189,7 @@ public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var)
 
         $d->resolve(1);
 
-        $this->assertError('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+        $this->assertError('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
         $this->restoreErrorHandler();
     }
 }

tests/React/Promise/TestCase.php

@@ -41,7 +41,7 @@ public function createCallableMock()
         return $this->getMock('React\\Promise\Stub\CallableStub');
     }
 
-    public function typesDataProvider()
+    public function invalidCallbackDataProvider()
     {
         return array(
             'empty string' => array(''),