Merge pull request #2 from cherry-framework/develop

Develop

Author: ABGEO

CHANGELOG.md

@@ -1,13 +1,18 @@
 # Cherry-core Changelog
 
-## [v1.0.0](https://github.com/ABGEO07/cherry-core/releases/tag/v1.0.0 "v1.0.0") (2019-03-29)
+## [v1.5.0](https://github.com/cherry-framework/core/releases/tag/v1.5.0 "v1.5.0") (2019-04-21)
+
+- Cherry [Router](https://github.com/cherry-framework/router) and  [Logger](https://github.com/cherry-framework/logger)
+was removed from Kernel class.
+
+## [v1.0.0](https://github.com/cherry-framework/core/releases/tag/v1.0.0 "v1.0.0") (2019-03-29)
 #### The first stable version
 
 - Package available on: `composer require cherry-project/core`
 
 - Core contains all cherry-project sub-packages
-    - [Request](https://github.com/ABGEO07/cherry-request)
-    - [Response](https://github.com/ABGEO07/cherry-response)
-    - [Router](https://github.com/ABGEO07/cherry-router)
-    - [Templater](https://github.com/ABGEO07/cherry-templater)
-    - [Logger](https://github.com/ABGEO07/cherry-logger)
+    - [Request](https://github.com/cherry-framework/request)
+    - [Response](https://github.com/cherry-framework/response)
+    - [Router](https://github.com/cherry-framework/router)
+    - [Templater](https://github.com/cherry-framework/templater)
+    - [Logger](https://github.com/cherry-framework/logger)

Cherry/Kernel.php

@@ -13,8 +13,6 @@
 
 namespace Cherry;
 
-use Cherry\Routing\Router;
-
 /**
  * Application Kernel class.
  *
@@ -28,9 +26,6 @@ class Kernel
 {
     private $_appRoot;
 
-    public $router;
-    public $logger;
-
     /**
      * Kernel constructor.
      *
@@ -42,20 +37,7 @@ public function __construct($appRoot)
 
         $this->_appRoot = __ROOT__;
 
-        $this->run();
-    }
-
-    /**
-     * Run application.
-     *
-     * @return void
-     */
-    public function run()
-    {
         $this->_readConfig();
-
-        $this->router = new Router();
-        $this->logger = new Logger('app', LOGS_PATH);
     }
 
     /**
@@ -109,4 +91,4 @@ private function _readConfig()
             define($k, __ROOT__ . '/' . $v);
         }
     }
-}
+}

README.md

@@ -1,26 +1,29 @@
 # Cherry-Core
 The Cherry-project Core
 
-[![GitHub license](https://img.shields.io/github/license/abgeo07/cherry-core.svg)](https://github.com/ABGEO07/cherry-core/blob/master/LICENSE)
+[![GitHub license](https://img.shields.io/github/license/cherry-framework/core.svg)](https://github.com/cherry-framework/core/blob/master/LICENSE)
 
-[![GitHub release](https://img.shields.io/github/release/abgeo07/cherry-core.svg)](https://github.com/ABGEO07/cherry-core/releases)
+[![GitHub release](https://img.shields.io/github/release/cherry-framework/core.svg)](https://github.com/cherry-framework/core/releases)
 
-[![Packagist Version](https://img.shields.io/packagist/v/cherry-project/core.svg "Packagist Version")](https://packagist.org/packages/cherry-core/request "Packagist Version")
+[![Packagist Version](https://img.shields.io/packagist/v/cherry-project/core.svg "Packagist Version")](https://packagist.org/packages/cherry-project/core "Packagist Version")
 
 ------------
 
 This is core for Cherry-Project that contains Cherry [Request](https://github.com/ABGEO07/cherry-request),
 [Response](https://github.com/ABGEO07/cherry-response), [Router](https://github.com/ABGEO07/cherry-router),
-[Templater](https://github.com/ABGEO07/cherry-templater) and [Logger](https://github.com/ABGEO07/cherry-logger).
+and [Templater](https://github.com/ABGEO07/cherry-templater).
 
-In root of your application you must define main file and call application Core Kernel class:
+In root of your application you must define main file and call application Core Kernel
+and Router classes:
 
 ```php
-<?php
-
 require_once __DIR__ . '/../vendor/autoload.php';
 
+use Cherry\Routing\Router;
+
 $kernel = new Cherry\Kernel(__DIR__);
+
+$router = new Router();
 ```
 
 `Kernel` class takes only one argument - your application root path.

composer.json

@@ -16,9 +16,8 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
-        "cherry-project/router": "dev-master",
-        "cherry-project/templater": "dev-master",
-        "cherry-project/logger": "dev-master",
+        "cherry-project/router": "^1.0",
+        "cherry-project/templater": "^1.0",
         "ext-json": "*"
     },
     "autoload": {