Merge branch 'dev'

* dev:
  dev-master alias
  callAction
  branch alias
  phpunit-speedtrap in travis-ci
  v2.0.0

Author: ueaner

.coveralls.yml

@@ -0,0 +1,3 @@
+service_name: travis-ci
+coverage_clover: build/logs/clover.xml
+json_path: build/logs/coveralls-upload.json

.travis.yml

@@ -0,0 +1,39 @@
+dist: trusty
+sudo: false
+
+language: php
+
+env:
+  global:
+    - COMPOSER_ARGS="--ansi --prefer-dist --no-interaction --no-suggest --no-progress --optimize-autoloader"
+    - DEPS="phpunit/phpunit squizlabs/php_codesniffer php-coveralls/php-coveralls johnkary/phpunit-speedtrap"
+
+git:
+  depth: 3
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: hhvm
+    - php: nightly
+  include:
+    - php: 7.0
+    - php: 7.1
+      env: ANALYSIS="true"
+    - php: 7.2
+    - php: hhvm
+    - php: nightly
+
+before_script:
+  - composer require --dev $COMPOSER_ARGS $DEPS
+
+script:
+  - php vendor/bin/phpunit
+  - if [[ "$ANALYSIS" == "true" ]]; then php vendor/bin/phpcs ; fi
+
+after_script:
+  - if [[ "$ANALYSIS" == "true" && -f ./build/logs/clover.xml ]]; then php vendor/bin/php-coveralls -v; fi

README.md

@@ -1,8 +1,7 @@
 Soli PHP Framework
 --------------------
 
-Soli 是一个轻量级的 PHP 框架，参考了 [Phalcon]
-框架的设计，意在松耦合、可扩展、简洁易用。
+Soli 是一个轻量级的 PHP 框架，框架的设计，意在松耦合、可扩展、简洁易用。
 
 ## 提供的功能
 
@@ -20,7 +19,6 @@ MVC、[依赖注入]、[事件管理]、[闪存消息]、[模版引擎]（[Twig]
 
 [MIT License]
 
-[Phalcon]: https://phalconphp.com/
 [Twig]: http://twig.sensiolabs.org/
 [Smarty]: http://www.smarty.net/
 [依赖注入]: http://api.soliphp.com/Soli/Di.html

composer.json

@@ -18,16 +18,8 @@
     "require": {
         "php": ">=7.0",
         "ext-mbstring": "*",
-        "psr/container": "^1.0",
-        "nikic/fast-route": "^1.3"
-    },
-    "replace": {
-        "soliphp/di": "*",
-        "soliphp/events": "*"
-    },
-    "suggest": {
-        "smarty/smarty": "Smarty templating system",
-        "twig/twig": "Twig templating system"
+        "soliphp/di": "^2.0",
+        "soliphp/events": "^1.3"
     },
     "provide": {
         "psr/container-implementation": "^1.0",
@@ -43,5 +35,16 @@
             "Soli\\Tests\\": "tests/"
         }
     },
+    "repositories": {
+        "packagist": {
+            "type": "composer",
+            "url": "https://packagist.laravel-china.org"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    },
     "minimum-stability": "dev"
 }

src/Soli/App.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * @author ueaner <[email protected]>
+ */
+namespace Soli;
+
+/**
+ * 应用
+ *
+ * @property \Soli\RouterInterface $router
+ * @property \Soli\DispatcherInterface $dispatcher
+ */
+class App extends Component
+{
+    const VERSION = '2.0.0-dev';
+
+    const ON_BOOT      = 'app.boot';
+    const ON_FINISH    = 'app.finish';
+    const ON_TERMINATE = 'app.terminate';
+
+    /**
+     * 默认核心服务
+     */
+    protected $coreServices = [
+        //'router'     => \Soli\RouterInterface::class,
+        'dispatcher' => \Soli\Dispatcher::class,
+        'events'     => \Soli\Events\EventManager::class,
+    ];
+
+    /**
+     * 应用初始化
+     */
+    public function __construct()
+    {
+        $this->registerCoreServices();
+        // $this->registerAppServices();
+    }
+
+    protected function registerCoreServices()
+    {
+        $container = $this->getContainer();
+
+        foreach ($this->coreServices as $name => $service) {
+            // 允许自定义同名的 Service 覆盖默认的 Service
+            if (!$container->has($name)) {
+                $container->set($name, $service);
+            }
+        }
+    }
+
+    /**
+     * 应用程序启动方法
+     */
+    public function handle($argv = null)
+    {
+        $this->trigger(static::ON_BOOT);
+
+        $router = $this->router;
+        $dispatcher = $this->dispatcher;
+
+        $router->dispatch($argv);
+
+        // 调度器预处理：设置命名空间、控制器、方法及参数
+        if ($router->getNamespaceName()) {
+            $dispatcher->setNamespaceName($router->getNamespaceName());
+        }
+        if ($router->getHandlerName()) {
+            $dispatcher->setHandlerName($router->getHandlerName());
+        }
+        if ($router->getActionName()) {
+            $dispatcher->setActionName($router->getActionName());
+        }
+        if ($router->getParams()) {
+            $dispatcher->setParams($router->getParams());
+        }
+
+        // 执行调度
+        $returnedResponse = $dispatcher->dispatch();
+
+        $this->trigger(static::ON_FINISH, $returnedResponse);
+
+        return $returnedResponse;
+    }
+
+    public function terminate()
+    {
+        $this->trigger(static::ON_TERMINATE);
+    }
+}