Merge pull request #1 from rollun-com/develop

Develop

README.md

@@ -8,46 +8,28 @@
 Каркас для создания приложений. 
 
 * [Quickstart](https://github.com/avz-cmf/saas/blob/master/docs/Quickstart.md)
+
 * [Детальная документация](doc/)
-* [zaboy Rql](https://github.com/avz-cmf/zaboy-rest/blob/master/doc/RQL_PARSER.md)
-* [Запуск тестов](https://github.com/avz-cmf/zaboy-rest/blob/master/doc/TESTS.md)
-* [DataStore Абстрактные фабрики](https://github.com/avz-cmf/zaboy-rest/blob/master/doc/DataStore%20Abstract%20Factory.md)
-* [EAV](https://github.com/avz-cmf/zaboy-rest/blob/master/doc/EAVDataStore.md)
-* [EAV примеры](https://github.com/avz-cmf/zaboy-rest/blob/master/doc/EAV%20example.md)
-* [Composite](https://github.com/avz-cmf/zaboy-rest/blob/master/doc/Composite.md)
-* [Стандарты](https://github.com/avz-cmf/zaboy-skeleton/blob/master/docs/Standarts.md)
+
+* [zaboy Rql](https://github.com/rollun-com/rollun-datastore/blob/master/doc/RQL_PARSER.md)
+
+* [Запуск тестов](https://github.com/rollun-com/rollun-datastore/blob/master/doc/TESTS.md)
+
+* [DataStore Абстрактные фабрики](https://github.com/rollun-com/rollun-datastore/blob/master/doc/DataStore%20Abstract%20Factory.md)
+
+* [EAV](https://github.com/rollun-com/rollun-datastore/blob/master/doc/EAVDataStore.md)
+
+* [EAV примеры](https://github.com/rollun-com/rollun-datastore/blob/master/doc/EAV%20example.md)
+
+* [Composite](https://github.com/rollun-com/rollun-datastore/blob/master/doc/Composite.md)
+
+* [Стандарты](https://github.com/rollun-com/rollun-skeleton/blob/master/docs/Standarts.md)
 
 ## Запуск тестов
 
-Установите переменную окружения `'APP_ENV' = "dev"`;
-
-Перед тем как запускать тесты, создайте файл `test.local.php` в `config/autoload`
-и добавьте туда настройки для `httpDataStore` изменив localhost в параметре url так что бы по нему можно было получить доступ к веб-приложению.
-
-Пример:
-
- ```php
-    return [
-        "dataStore" => [
-            'testHttpClient' => [
-                'class' => 'rollun\datastore\DataStore\HttpClient',
-                'tableName' => 'test_res_http',
-                'url' => 'http://localhost/api/rest/test_res_http',
-                'options' => ['timeout' => 30]
-            ],
-            'testEavOverHttpClient' => [
-                'class' => 'rollun\datastore\DataStore\HttpClient',
-                 'url' => 'http://localhost/api/rest/entity_product',
-                 'options' => ['timeout' => 30]
-            ],
-            'testEavOverHttpDbClient' => [
-                        'class' => 'rollun\datastore\DataStore\HttpClient',
-                        'url' => 'http://localhost:9090/api/rest/db'. EavAbstractFactory::DB_NAME_DELIMITER . 'entity_product',
-                        'options' => ['timeout' => 30]
-                   ],
-        ]
-    ];
- ```
+Установите переменную окружения `'APP_ENV' = "dev"`.
+Так же добавте переменную окружение `HOST` в которую поместите ip или домен вашего приложения
+> Или добавте данные переменную в файл `env_config.php`.
 
 Скопируйте `index.php`и .htaccess из библиотеки в паблик директорию проекта.
 

composer.json

@@ -14,23 +14,25 @@
   ],
   "require": {
     "php": "^5.6 || ^7.0",
+    "roave/security-advisories": "dev-master",
+    "zendframework/zend-expressive": "^1.0",
+    "zendframework/zend-expressive-helpers": "^2.0",
+    "zendframework/zend-expressive-fastroute": "^1.0",
     "zendframework/zend-servicemanager": "^3.0",
-    "zendframework/zend-stratigility": "^1.1",
-    "psr/http-message": "^1.0",
-    "zendframework/zend-diactoros": "^1.1",
-    "zendframework/zend-config": "^2.6",
-    "xiag/rql-parser": "^1.0",
     "zendframework/zend-stdlib": "^3",
     "zendframework/zend-json": "^3",
     "zendframework/zend-db": "2.8.2",
     "zendframework/zend-http": "^2.5",
+    "xiag/rql-parser": "^1.0",
     "symfony/filesystem": ">=2.7",
     "phpunit/phpunit": "^4.0",
     "psr/log": "^1.0",
-    "rollun-com/rollun-installer": "dev-master"
+    "rollun-com/rollun-installer": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.0"
+    "phpunit/phpunit": "^4.0",
+    "squizlabs/php_codesniffer": "^2.3",
+    "filp/whoops": "^1.1 || ^2.0"
   },
   "autoload": {
     "psr-4": {
@@ -43,6 +45,7 @@
     }
   },
   "scripts": {
+    "serve": "php -S 0.0.0.0:8080 -t public public/index.php",
     "lib-install": "rollun\\installer\\Command::install",
     "lib-uninstall": "rollun\\installer\\Command::uninstall",
     "lib-reinstall": "rollun\\installer\\Command::reinstall"