some update

Author: inhere

src/Collections/LiteCollection.php

@@ -80,6 +80,25 @@ public function replace(array $items)
         }
     }
 
+    /**
+     * @param callable $filter
+     * @return static
+     */
+    public function reject(callable $filter)
+    {
+        $data = [];
+
+        foreach ($this as $key => $value) {
+            if (!$filter($value, $key)) {
+                $data[$key] = $value;
+            }
+
+            unset($this[$key]);
+        }
+
+        return new static($data);
+    }
+
     /**
      * @param callable $callback
      * @return static
@@ -90,6 +109,7 @@ public function map(callable $callback)
 
         foreach ($this as $key => $value) {
             $data[$key] = $callback($value, $key);
+            unset($this[$key]);
         }
 
         return new static($data);
@@ -101,14 +121,14 @@ public function map(callable $callback)
      */
     public function implode($char = ',')
     {
-        $string = '';
-
-        foreach ($this as $key => $value) {
+//        $string = '';
+//
+//        foreach ($this as $key => $value) {
 //            $string .= is_array($value) ? $this->implode($char, $value) : implode($char, $value);
-            $string .= implode($char, $value);
-        }
+//            $string .= implode($char, $value);
+//        }
 
-        return $string;
+        return implode($char, $this->all());
     }
 
     /**

src/Collections/SimpleCollection.php

@@ -123,6 +123,25 @@ public function sets(array $data)
         return $this;
     }
 
+    /**
+     * @param callable $filter
+     * @return static
+     */
+    public function reject(callable $filter)
+    {
+        $data = [];
+
+        foreach ($this as $key => $value) {
+            if (!$filter($value, $key)) {
+                $data[$key] = $value;
+            }
+
+            unset($this[$key]);
+        }
+
+        return new static($data);
+    }
+
     /**
      * @param callable $callback
      * @return static
@@ -133,6 +152,7 @@ public function map(callable $callback)
 
         foreach ($this->getIterator() as $key => $value) {
             $data[$key] = $callback($value, $key);
+            unset($this[$key]);
         }
 
         return new static($data);
@@ -144,14 +164,7 @@ public function map(callable $callback)
      */
     public function implode($char = ',')
     {
-        $string = '';
-
-        foreach ($this->getIterator() as $key => $value) {
-//            $string .= is_array($value) ? $this->implode($char, $value) : implode($char, $value);
-            $string .= implode($char, $value);
-        }
-
-        return $string;
+        return implode($char, $this->all());
     }
 
     /**

src/Helpers/Str.php

@@ -31,29 +31,29 @@ public static function optional(string $string, string $prefix = ' ', string $su
     }
 
     /**
-     * @param string $needle
-     * @param string|array $string
+     * @param string $string
+     * @param string|array $needle
      * @return bool
      */
-    public static function contains(string $needle, $string)
+    public static function contains(string $string, $needle)
     {
-        return self::has($needle, $string);
+        return self::has($string, $needle);
     }
 
     /**
-     * @param string $needle
-     * @param string|array  $string
+     * @param string $string
+     * @param string|array $needle
      * @return bool
      */
-    public static function has(string $needle, $string)
+    public static function has(string $string, $needle)
     {
         if (is_string($string)) {
             return stripos($string, $needle) !== false;
         }
 
-        if (is_array($string)) {
-            foreach ((array)$string as $item) {
-                if (stripos($item, $needle) !== false) {
+        if (is_array($needle)) {
+            foreach ((array)$needle as $item) {
+                if (stripos($string, $item) !== false) {
                     return true;
                 }
             }