Merge branch 'noglob' of http://gitlab.edu.yar.ru/composer/PHP_Library into noglob

src/Controller/Component.php

@@ -12,7 +12,7 @@ use ctiso\HttpRequest,
     ctiso\Database\PDOStatement,
     ctiso\Collection,
     ctiso\Registry,
-    App\Controller\Site,
+    ctiso\Controller\SiteInterface,
     PHPTAL,
     PHPTAL_PreFilter_Normalize;
 
@@ -207,7 +207,7 @@ class Component
         $view->component_title = $settings['title'];
     }
 
-    static function loadComponent($expression, /*.Site.*/ $site)
+    static function loadComponent($expression, /*.SiteInterface.*/ $site)
     {
     
         $expression = htmlspecialchars_decode($expression);
@@ -249,7 +249,7 @@ class Component
             }
         }        
 
-        $db = $site->db;
+        $db = $site->getDatabase();
 
         $component->db = $db;
         $component->config = $site->config;

src/Controller/SiteInterface.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace ctiso\Controller;
+
+interface SiteInterface {
+    function loadComponent($expression); 
+    function getDatabase();
+    function getConfig();
+    function setComponentConfig($config);
+    function addRequireJsPath($name, $path, $schim = null);
+}