Replace illuminate/support with underscore-php.

Signed-off-by: crynobone <crynobone@gmail.com>
laravie · Dec 30, 2015 · 9c3821a · 9c3821a
1 parent d5c8a9a
commit 9c3821a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -18,16 +18,15 @@
     },
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "~5.0",
-        "paragonie/random_compat": "~1.1"
+        "anahkiasen/underscore-php": "~2.0"
     },
     "require-dev": {
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~4.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1-dev"
         }
     },
     "minimum-stability": "dev"

diff --git a/src/Document.php b/src/Document.php
@@ -1,6 +1,6 @@
 <?php namespace Laravie\Parser;
 
-use Illuminate\Support\Str;
+use Underscore\Types\Strings;
 
 abstract class Document
 {
@@ -169,7 +169,7 @@ protected function getFilterResolver($filter)
      */
     protected function parseData($data)
     {
-        $hash   = Str::random(60);
+        $hash   = Strings::random(60);
         $value  = $data;
         $filter = null;
 

diff --git a/src/Xml/Document.php b/src/Xml/Document.php
@@ -1,7 +1,8 @@
 <?php namespace Laravie\Parser\Xml;
 
 use SimpleXMLElement;
-use Illuminate\Support\Arr;
+use Underscore\Types\Arrays;
+use Underscore\Types\Object;
 use Laravie\Parser\Document as BaseDocument;
 
 class Document extends BaseDocument
@@ -22,7 +23,7 @@ class Document extends BaseDocument
      */
     public function rebase($base = null)
     {
-        $this->content = data_get($this->getOriginalContent(), $base);
+        $this->content = Arrays::get($this->getOriginalContent(), $base);
 
         return $this;
     }
@@ -107,13 +108,15 @@ protected function getRawValueAttribute(SimpleXMLElement $content, $use, $defaul
     {
         list($value, $attribute) = explode('::', $use, 2);
 
-        if (is_null($parent = object_get($content, $value))) {
+        $parent = $content;
+
+        if (! empty($value) && is_null($parent = Object::get($content, $value))) {
             return $default;
         }
 
         $attributes = $parent->attributes();
 
-        return Arr::get($attributes, $attribute, $default);
+        return Arrays::get($attributes, $attribute, $default);
     }
 
     /**
@@ -127,7 +130,7 @@ protected function getRawValueAttribute(SimpleXMLElement $content, $use, $defaul
      */
     protected function getValueData(SimpleXMLElement $content, $use, $default = null)
     {
-        $value = $this->castValue(data_get($content, $use));
+        $value = $this->castValue(Arrays::get($content, $use));
 
         if (empty($value) && ! in_array($value, ['0'])) {
             return $default;
@@ -154,7 +157,7 @@ protected function getValueCollection(SimpleXMLElement $content, array $matches,
             list($parent, $namespace) = explode('/', $parent, 2);
         }
 
-        $collection = data_get($content, $parent);
+        $collection = Arrays::get($content, $parent);
         $namespaces = $this->getAvailableNamespaces();
 
         $uses   = explode(',', $matches[2]);
@@ -204,14 +207,14 @@ protected function parseValueCollection(SimpleXMLElement $content, array $uses)
                 if (is_null($as)) {
                     $value = array_merge($value, $item);
                 } else {
-                    Arr::set($value, $as, $item);
+                    $value = Arrays::set($value, $as, $item);
                 }
             } else {
                 if ($name == '@') {
                     $name = null;
                 }
 
-                Arr::set($value, $as, $this->getValue($content, $name));
+                $value = Arrays::set($value, $as, $this->getValue($content, $name));
             }
         }