From 8f5d0298682c660f56a4cf543156a708b0c0fe60 Mon Sep 17 00:00:00 2001
From: "CORP\\phedor" <origami11@yandex.ru>
Date: Fri, 16 Feb 2018 12:11:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=82=D0=B8=D0=BF=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Connection/HttpRequest.php | 13 ++-----------
 src/Setup.php                  |  3 +++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Connection/HttpRequest.php b/src/Connection/HttpRequest.php
index 01176c8..ce2f13b 100644
--- a/src/Connection/HttpRequest.php
+++ b/src/Connection/HttpRequest.php
@@ -99,18 +99,9 @@ class Connection_HttpRequest
     static function getJSON($url, $data) {
         $query = http_build_query($data);
         $q = $url . '?' . $query;
-        /*$c = new Connection_HttpRequest();
-        $c->http_version = "HTTP/1.0";
 
-
-        $c->setUrl($q);
-        $page = $c->getPage();
-
-        $response = new Connection_HttpResponse($page);
-        $data = $response->getData();
-        */
-        $data = file_get_contents($q);
-        return json_decode((string) preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/', '', $data), true);
+        $content = File::getContents($q);
+        return json_decode((string) preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/', '', $content), true);
     }
 }
 
diff --git a/src/Setup.php b/src/Setup.php
index 61de243..52a5a0f 100644
--- a/src/Setup.php
+++ b/src/Setup.php
@@ -17,7 +17,9 @@ class Setup
     protected $stack = array();
     
     public $zip;
+
     public $target;
+    public $source;
 
     public function __construct($file)
     {
@@ -25,6 +27,7 @@ class Setup
         $this->node = simplexml_load_file($file);
 
         $this->target = '';
+        $this->source = '';
         $this->zip = new ZipArchive();
         $this->zip->open(strtr($file, array('.xml' => '.zip')));