Cover it all

antonioribeiro · Nov 30, 2017 · f1fb400 · f1fb400
1 parent bd8f490
commit f1fb400
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -20,6 +20,7 @@
     <logging>
         <log type="coverage-html" target="coverage/" lowUpperBound="35" highLowerBound="70"/>
         <log type="coverage-clover" target="coverage/coverage-clover.xml" lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
     </logging>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">

diff --git a/src/package/Yaml.php b/src/package/Yaml.php
@@ -2,13 +2,9 @@
 
 namespace PragmaRX\Yaml\Package;
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Support\Collection;
-use JsonSerializable;
 use PragmaRX\Yaml\Package\Support\File;
 use PragmaRX\Yaml\Package\Support\Parser;
-use Traversable;
 
 class Yaml
 {
@@ -86,7 +82,7 @@ public function recursivelyFindAndReplaceKeysToSelf($new, $keys = null)
         do {
             $old = $new;
 
-            if (is_array($old instanceof Arrayable ? $old->toArray() : $old)) {
+            if (is_array($old instanceof Collection ? $old->toArray() : $old)) {
                 return collect($old)->map(function ($item) use ($keys) {
                     return $this->recursivelyFindAndReplaceKeysToSelf($item, $keys);
                 });
@@ -126,7 +122,7 @@ public function replaceKeysToSelf($string, $keys)
      */
     protected function recursivelyFindAndReplaceExecutableCode($old)
     {
-        if (is_array($old instanceof Arrayable ? $old->toArray() : $old)) {
+        if (is_array($old instanceof Collection ? $old->toArray() : $old)) {
             return collect($old)->map(function ($item) {
                 return $this->recursivelyFindAndReplaceExecutableCode($item);
             });
@@ -235,7 +231,7 @@ public function loadFile($file, $parseYaml = true)
      */
     public function cleanArrayKeysRecursive($dirty)
     {
-        if (is_array($dirty instanceof Arrayable ? $dirty->toArray() : $dirty)) {
+        if (is_array($dirty instanceof Collection ? $dirty->toArray() : $dirty)) {
             return collect($dirty)->mapWithKeys(function ($item, $key) {
                 return [
                     $this->cleanKey($key) => $this->cleanArrayKeysRecursive($item),
@@ -269,22 +265,4 @@ public function instance()
     {
         return $this;
     }
-
-    /**
-     * Check if value is arrayable.
-     *
-     * @param mixed $items
-     *
-     * @return bool
-     */
-    protected function isArrayable($items)
-    {
-        return
-            is_array($items) ||
-            $items instanceof self ||
-            $items instanceof Arrayable ||
-            $items instanceof Jsonable ||
-            $items instanceof JsonSerializable ||
-            $items instanceof Traversable;
-    }
 }