ircmaxell
diff --git a/‎.gitignore‎
100644100755 b/‎.gitignore‎
100644100755
diff --git a/‎README.md‎
100644100755 b/‎README.md‎
100644100755
diff --git a/‎composer.json‎
100644100755 b/‎composer.json‎
100644100755
diff --git a/‎lib/MonadPHP/Chain.php‎
100644100755 b/‎lib/MonadPHP/Chain.php‎
100644100755
diff --git a/‎lib/MonadPHP/Deferred.php‎
100644100755 b/‎lib/MonadPHP/Deferred.php‎
100644100755
diff --git a/‎lib/MonadPHP/Identity.php‎
100644100755 b/‎lib/MonadPHP/Identity.php‎
100644100755
diff --git a/‎lib/MonadPHP/ListMonad.php‎
100644100755
Lines changed: 2 additions & 2 deletions b/‎lib/MonadPHP/ListMonad.php‎
100644100755
Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/MonadPHP/Maybe.php‎
100644100755
Lines changed: 2 additions & 2 deletions b/‎lib/MonadPHP/Maybe.php‎
100644100755
Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/MonadPHP/Monad.php‎
100644100755
Lines changed: 5 additions & 6 deletions b/‎lib/MonadPHP/Monad.php‎
100644100755
Lines changed: 5 additions & 6 deletions
diff --git a/‎lib/MonadPHP/Promise.php‎
100644100755
Lines changed: 2 additions & 2 deletions b/‎lib/MonadPHP/Promise.php‎
100644100755
Lines changed: 2 additions & 2 deletions
@@ -16,7 +16,7 @@ public function bind($function, array $args = array()) {
         foreach ($this->value as $value) {
             $result[] = $this->runCallback($function, $value, $args);
         }
-        return $this->unit($result);
+        return $this::unit($result);
     }
 
     public function extract() {
@@ -31,4 +31,4 @@ public function extract() {
         return $ret;
     }
 
-}
+}
@@ -8,7 +8,7 @@ public function bind($function){
         if (!is_null($this->value)) {
             return parent::bind($function);
         }
-        return $this->unit(null);
+        return $this::unit(null);
     }
 
-}
+}
@@ -10,16 +10,15 @@ public function __construct($value) {
         $this->value = $value;
     }
 
-    public function unit($value) {
-        if ($value instanceof $this) {
+    public static function unit($value) {
+        if ($value instanceof static) {
             return $value;
         }
-        $class = get_class($this);
-        return new $class($value);
+        return new static($value);
     }
 
     public function bind($function, array $args = array()) {
-        return $this->unit($this->runCallback($function, $this->value, $args));
+        return $this::unit($this->runCallback($function, $this->value, $args));
     }
 
     public function extract() {
@@ -37,4 +36,4 @@ protected function runCallback($function, $value, array $args = array()) {
         return call_user_func_array($function, $args);
     }
 
-}
+}
@@ -16,7 +16,7 @@ public function __construct($success = null, $failure = null) {
         $this->failure = $failure;
     }
 
-    public function unit($success = null, $failure = null) {
+    public static function unit($success = null, $failure = null) {
         return new Promise($success, $failure); 
     }
 
@@ -49,4 +49,4 @@ protected function resolve($status, $value) {
     public function when($success = null, $failure = null) {
         return $this->bind($success, $failure);
     }
-}
+}
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function bind($function, array $args = array()) {`
`16`	`16`	`foreach ($this->value as $value) {`
`17`	`17`	`$result[] = $this->runCallback($function, $value, $args);`
`18`	`18`	`}`
`19`		`- return $this->unit($result);`
	`19`	`+ return $this::unit($result);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public function extract() {`
`@@ -31,4 +31,4 @@ public function extract() {`
`31`	`31`	`return $ret;`
`32`	`32`	`}`
`33`	`33`
`34`		`-}`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public function bind($function){`
`8`	`8`	`if (!is_null($this->value)) {`
`9`	`9`	`return parent::bind($function);`
`10`	`10`	`}`
`11`		`- return $this->unit(null);`
	`11`	`+ return $this::unit(null);`
`12`	`12`	`}`
`13`	`13`
`14`		`-}`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,16 +10,15 @@ public function __construct($value) {`
`10`	`10`	`$this->value = $value;`
`11`	`11`	`}`
`12`	`12`
`13`		`- public function unit($value) {`
`14`		`- if ($value instanceof $this) {`
	`13`	`+ public static function unit($value) {`
	`14`	`+ if ($value instanceof static) {`
`15`	`15`	`return $value;`
`16`	`16`	`}`
`17`		`- $class = get_class($this);`
`18`		`- return new $class($value);`
	`17`	`+ return new static($value);`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`public function bind($function, array $args = array()) {`
`22`		`- return $this->unit($this->runCallback($function, $this->value, $args));`
	`21`	`+ return $this::unit($this->runCallback($function, $this->value, $args));`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`public function extract() {`
`@@ -37,4 +36,4 @@ protected function runCallback($function, $value, array $args = array()) {`
`37`	`36`	`return call_user_func_array($function, $args);`
`38`	`37`	`}`
`39`	`38`
`40`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function __construct($success = null, $failure = null) {`
`16`	`16`	`$this->failure = $failure;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public function unit($success = null, $failure = null) {`
	`19`	`+ public static function unit($success = null, $failure = null) {`
`20`	`20`	`return new Promise($success, $failure);`
`21`	`21`	`}`
`22`	`22`
`@@ -49,4 +49,4 @@ protected function resolve($status, $value) {`
`49`	`49`	`public function when($success = null, $failure = null) {`
`50`	`50`	`return $this->bind($success, $failure);`
`51`	`51`	`}`
`52`		`-}`
	`52`	`+}`