From e9f7c239902a2b8320a670bfbbd5f24e2fd0c416 Mon Sep 17 00:00:00 2001
From: "CORP\\phedor" <origami11@yandex.ru>
Date: Tue, 27 Mar 2018 17:31:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=BE=D0=B4=D1=83=D0=BB=D0=B8=20c=20name?=
 =?UTF-8?q?space?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Adapter.php               |  2 +
 src/Arr.php                   |  2 +
 src/Collection.php            |  2 +
 src/Controller/Front.php      |  4 +-
 src/Controller/Service.php    |  2 +-
 src/Database.php              |  2 +-
 src/Database/PDOStatement.php |  7 +++-
 src/Functions.php             |  4 +-
 src/Layout/Manager.php        |  4 +-
 src/Tales.php                 | 72 +++++++++++++++++++++++++++++++++++
 src/tales.php                 | 71 ----------------------------------
 11 files changed, 92 insertions(+), 80 deletions(-)
 create mode 100644 src/Tales.php
 delete mode 100644 src/tales.php

diff --git a/src/Adapter.php b/src/Adapter.php
index 42bd4ab..5af0d7b 100644
--- a/src/Adapter.php
+++ b/src/Adapter.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ctiso;
+
 /**
  * Интерфейс к массиву и обьекту как к коллекции
  */
diff --git a/src/Arr.php b/src/Arr.php
index 488d82c..1e89bea 100644
--- a/src/Arr.php
+++ b/src/Arr.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ctiso;
+
 class Arr {
     static function get($data, $key, $default = null) {
         return isset($data[$key]) ? $data[$key] : $default;
diff --git a/src/Collection.php b/src/Collection.php
index e56b2d1..da058f7 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -1,4 +1,6 @@
 <?php
+
+namespace ctiso;
 /**
  * Коллекция
  * 
diff --git a/src/Controller/Front.php b/src/Controller/Front.php
index 772d177..8c4ee74 100644
--- a/src/Controller/Front.php
+++ b/src/Controller/Front.php
@@ -53,7 +53,9 @@ class Controller_Front extends Controller_Action
             $moduleFile = Shortcut::getUrl($this->shortcut, $name, $name); // ModuleLoader (2)
         }
 
-        $module = $this->loadClass($moduleFile, null, 'Module_');
+        $ucname = ucfirst($name);
+        $moduleClass = "Module\\$ucname\\$ucname";
+        $module = new $moduleClass();//$this->loadClass($moduleFile, null, 'Module\\');
         if ($module) {
             // Инициализация модуля
             $module->viewPath = Shortcut::getUrl('modulepath', $name);
diff --git a/src/Controller/Service.php b/src/Controller/Service.php
index 64b8a59..43f0802 100644
--- a/src/Controller/Service.php
+++ b/src/Controller/Service.php
@@ -46,7 +46,7 @@ class Controller_Service
         return $model;
     }
 
-    public function options($key, $val, $res) {
+    public function options($key, $val, /*.Database_PDOStatement.*/$res) {
         $result = array();
         while($res->next()) {
             $result[] = array('value' => $res->getInt($key), 'name' => $res->getString($val));
diff --git a/src/Database.php b/src/Database.php
index 415619d..2d5e8ad 100644
--- a/src/Database.php
+++ b/src/Database.php
@@ -1,6 +1,6 @@
 <?php
 ///<reference path="Database/PDOStatement.php" />
-require_once "Database/PDOStatement.php";
+namespace ctiso;
 
 /**
  * Класс оболочка для PDO для замены Creole 
diff --git a/src/Database/PDOStatement.php b/src/Database/PDOStatement.php
index e74a244..b780ae3 100644
--- a/src/Database/PDOStatement.php
+++ b/src/Database/PDOStatement.php
@@ -1,13 +1,16 @@
 <?php
 
-class Database_PDOStatement extends PDOStatement implements IteratorAggregate
+namespace ctiso\Database\PDOStatement;
+use ctiso\Database\StatementIterator;
+
+class PDOStatement extends \PDOStatement implements \IteratorAggregate
 {
     protected $cursorPos = 0;
     public $cache = array();   
     public $fields;
 
     function getIterator() {
-        return new Database_StatementIterator($this);
+        return new StatementIterator($this);
     }
 
     protected function __construct() {    
diff --git a/src/Functions.php b/src/Functions.php
index 61b9123..63c131e 100644
--- a/src/Functions.php
+++ b/src/Functions.php
@@ -88,7 +88,7 @@ class __compose {
 
 class Functions {
 
-    static function partial() {
+    static function partial($_rest) {
         $closure = new __partial(func_get_args());
         return array($closure, 'apply');
     }
@@ -101,7 +101,7 @@ class Functions {
      *
      * @return array[int]mixed 
      */
-    static function compose() {
+    static function compose($_rest) {
         $closure = new __compose(func_get_args());
         return array($closure, 'apply');
     }
diff --git a/src/Layout/Manager.php b/src/Layout/Manager.php
index 942a8fd..33b934a 100644
--- a/src/Layout/Manager.php
+++ b/src/Layout/Manager.php
@@ -30,7 +30,7 @@ class Layout_Manager extends Filter_Filter
         $this->addCondition(Functions::rcurry(array($this, 'checkXHR'), $get), $layout);
     }
 
-    public function checkGet($request, $get)
+    public function checkGet(/*.HttpRequest.*/$request, $get)
     {
         if (is_array($get)) {
             foreach ($get as $key => $value) {
@@ -42,7 +42,7 @@ class Layout_Manager extends Filter_Filter
         return true;
     }
 
-    public function checkXHR($request, $get)
+    public function checkXHR(/*.HttpRequest.*/$request, $get)
     {
         return $request->isAjax() && $this->checkGet($request, $get);
     }
diff --git a/src/Tales.php b/src/Tales.php
new file mode 100644
index 0000000..fb919b6
--- /dev/null
+++ b/src/Tales.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Расширения для PHPTAL для отображения времени и даты
+ */
+class DateTime_Tales implements PHPTAL_Tales
+{
+    static public function date($expression, $nothrow = false)
+    {
+        return "Tales::phptal_date(".PHPTAL_Php_TalesInternal::path ($expression).")";
+    }
+
+    static public function time($expression, $nothrow = false)
+    {
+        return "Tales::phptal_time(".PHPTAL_Php_TalesInternal::path ($expression).")";
+    }
+}
+
+
+/**
+ * TALES для подключения компонентов 
+ * component:name?param1=value1&param2=value2
+ */
+class Component_Tales implements PHPTAL_Tales
+{
+    static public function component($expression, $nothrow = false)
+    {
+        $s = PHPTAL_Php_TalesInternal::string($expression);
+        return "Tales::phptal_component(" . $s . ")";
+    }
+}
+
+class Tales {
+
+    static function phptal_date ($e) {
+        return date("d.m.Y", $e);
+    }
+
+    static function phptal_time ($e) {
+        return date("H:i", $e);
+    }
+
+    /**
+     * Функция подключения компонента
+     */
+    static function phptal_component ($expression) {
+        $begin = floatval(microtime(true));
+        /*.Controller_Component.*/$component = null;
+    
+        if (class_exists("Controller_Site")) { //Если мы в CMS2
+            $component = Controller_Site::loadComponent($expression);
+        } else {
+            global $db, $registry; // Иначе обращаемся к глобальным переменным
+            $component = Controller_Component::loadComponent($expression, $db, $registry);
+        }
+        $req = new HttpRequest();
+    
+        $result = $component->execute($req);
+    
+        echo "<!-- ", $expression, ", ", round(floatval(microtime(true)) - $begin, 4), "sec -->";
+        return $result;
+    }
+
+
+    static function register() {
+        /* Регистрация нового префикса для подключения компонента */
+        $tales = PHPTAL_TalesRegistry::getInstance();
+        $tales->registerPrefix('component', array('Component_Tales', 'component'));
+        $tales->registerPrefix('date', array('DateTime_Tales', 'date'));
+        $tales->registerPrefix('time', array('DateTime_Tales', 'time'));
+    }
+}
diff --git a/src/tales.php b/src/tales.php
deleted file mode 100644
index 2c9bc91..0000000
--- a/src/tales.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Расширения для PHPTAL для отображения времени и даты
- */
-class DateTime_Tales implements PHPTAL_Tales
-{
-    static public function date($expression, $nothrow = false)
-    {
-        return "phptal_date(".PHPTAL_Php_TalesInternal::path ($expression).")";
-    }
-
-    static public function time($expression, $nothrow = false)
-    {
-        return "phptal_time(".PHPTAL_Php_TalesInternal::path ($expression).")";
-    }
-}
-
-
-/**
- * TALES для подключения компонентов 
- * component:name?param1=value1&param2=value2
- */
-class Component_Tales implements PHPTAL_Tales
-{
-    static public function component($expression, $nothrow = false)
-    {
-        $s = PHPTAL_Php_TalesInternal::string($expression);
-        return "phptal_component(" . $s . ")";
-    }
-}
-
-
-function phptal_date ($e)
-{
-    return date("d.m.Y", $e);
-}
-
-function phptal_time ($e)
-{
-    return date("H:i", $e);
-}
-
-/**
- * Функция подключения компонента
- */
-function phptal_component ($expression) {
-    $begin = floatval(microtime(true));
-    /*.Controller_Component.*/$component = null;
-
-    if (class_exists("Controller_Site")) { //Если мы в CMS2
-        $component = Controller_Site::loadComponent($expression);
-    } else {
-        global $db, $registry; // Иначе обращаемся к глобальным переменным
-        $component = Controller_Component::loadComponent($expression, $db, $registry);
-    }
-    $req = new HttpRequest();
-
-    $result = $component->execute($req);
-
-    echo "<!-- ", $expression, ", ", round(floatval(microtime(true)) - $begin, 4), "sec -->";
-    return $result;
-}
-
-
-/* Регистрация нового префикса для подключения компонента */
-$tales = PHPTAL_TalesRegistry::getInstance();
-$tales->registerPrefix('component', array('Component_Tales', 'component'));
-$tales->registerPrefix('date', array('DateTime_Tales', 'date'));
-$tales->registerPrefix('time', array('DateTime_Tales', 'time'));
-