Merge branch 'dsdolzhenko-master' into composer-support

Conflicts: kladr.php
garakh · Jul 22, 2015 · 3e0a9c1 · 3e0a9c1
2 parents 03769ab + 3268501
commit 3e0a9c1
Show file tree

Hide file tree

Showing 12 changed files with 387 additions and 347 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.idea/
+vendor/
+composer.phar
diff --git a/composer.json b/composer.json
@@ -0,0 +1,21 @@
+{
+  "name": "garakh/kladrapi-php",
+  "description": "PHP API for http://kladr-api.ru",
+  "type": "library",
+  "authors": [
+    {
+      "name": "Iliya Garakh",
+      "email": "[email protected]"
+    },
+    {
+      "name": "Alexandr Yakovlev",
+      "email": "[email protected]"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Kladr\\": "src/"
+    }
+  },
+  "require": {}
+}
diff --git a/examples/search_by_zip.php b/examples/search_by_zip.php
@@ -1,5 +1,6 @@
 <?
-include '../kladr.php';
+
+require __DIR__ . '/../vendor/autoload.php';
 
 // Инициализация api, в качестве параметров указываем токен и ключ для доступа к сервису
 $api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');

diff --git a/examples/search_objects.php b/examples/search_objects.php
@@ -1,5 +1,6 @@
 <?php
-include '../kladr.php';
+
+require __DIR__ . '/../vendor/autoload.php';
 
 use Kladr\Api;
 use Kladr\Query;

diff --git a/examples/search_one_string.php b/examples/search_one_string.php
@@ -1,5 +1,6 @@
 <?
-include '../kladr.php';
+
+require __DIR__ . '/../vendor/autoload.php';
 
 // Инициализация api, в качестве параметров указываем токен и ключ для доступа к сервису
 $api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');

diff --git a/examples/search_streets.php b/examples/search_streets.php
@@ -1,5 +1,6 @@
 <?
-include '../kladr.php';
+
+require __DIR__ . '/../vendor/autoload.php';
 
 // Инициализация api, в качестве параметров указываем токен и ключ для доступа к сервису
 $api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');

diff --git a/examples/simple.php b/examples/simple.php
@@ -1,5 +1,6 @@
 <?php
-include '../kladr.php';
+
+require __DIR__ . '/../vendor/autoload.php';
 
 $api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');