Skip to content

Commit 3e0a9c1

Browse files
author
Iliya Garakh
committed
Merge branch 'dsdolzhenko-master' into composer-support
Conflicts: kladr.php
2 parents 03769ab + 3268501 commit 3e0a9c1

File tree

12 files changed

+387
-347
lines changed

12 files changed

+387
-347
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.idea/
2+
vendor/
3+
composer.phar

composer.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"name": "garakh/kladrapi-php",
3+
"description": "PHP API for http://kladr-api.ru",
4+
"type": "library",
5+
"authors": [
6+
{
7+
"name": "Iliya Garakh",
8+
"email": "garakh@primepix.ru"
9+
},
10+
{
11+
"name": "Alexandr Yakovlev",
12+
"email": "xescoder@gmail.com"
13+
}
14+
],
15+
"autoload": {
16+
"psr-4": {
17+
"Kladr\\": "src/"
18+
}
19+
},
20+
"require": {}
21+
}

examples/search_by_zip.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?
2-
include '../kladr.php';
2+
3+
require __DIR__ . '/../vendor/autoload.php';
34

45
// Инициализация api, в качестве параметров указываем токен и ключ для доступа к сервису
56
$api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');

examples/search_objects.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
include '../kladr.php';
2+
3+
require __DIR__ . '/../vendor/autoload.php';
34

45
use Kladr\Api;
56
use Kladr\Query;

examples/search_one_string.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?
2-
include '../kladr.php';
2+
3+
require __DIR__ . '/../vendor/autoload.php';
34

45
// Инициализация api, в качестве параметров указываем токен и ключ для доступа к сервису
56
$api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');

examples/search_streets.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?
2-
include '../kladr.php';
2+
3+
require __DIR__ . '/../vendor/autoload.php';
34

45
// Инициализация api, в качестве параметров указываем токен и ключ для доступа к сервису
56
$api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');

examples/simple.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
include '../kladr.php';
2+
3+
require __DIR__ . '/../vendor/autoload.php';
34

45
$api = new Kladr\Api('51dfe5d42fb2b43e3300006e', '86a2c2a06f1b2451a87d05512cc2c3edfdf41969');
56

0 commit comments

Comments
 (0)