@@ -159,6 +159,9 @@ discard block |
||
| 159 | 159 | return $this; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | + /** |
|
| 163 | + * @param string $viewPath |
|
| 164 | + */ |
|
| 162 | 165 | public function view($viewPath) |
| 163 | 166 | { |
| 164 | 167 | if (is_a($viewPath, ViewInterface::class)) { |
@@ -250,7 +253,7 @@ discard block |
||
| 250 | 253 | } |
| 251 | 254 | |
| 252 | 255 | /** |
| 253 | - * @param null $controller |
|
| 256 | + * @param string|null $controller |
|
| 254 | 257 | * |
| 255 | 258 | * @throws ControllerActionNotFound |
| 256 | 259 | */ |
@@ -670,6 +670,9 @@ |
||
| 670 | 670 | return array('module_stack', 'render_mode'); |
| 671 | 671 | } |
| 672 | 672 | |
| 673 | + /** |
|
| 674 | + * @param string $path |
|
| 675 | + */ |
|
| 673 | 676 | protected function createMetadata($class, $name, $path) |
| 674 | 677 | { |
| 675 | 678 | $metadata = new ClassMetadata(); |
@@ -9,9 +9,6 @@ discard block |
||
| 9 | 9 | namespace samson\core; |
| 10 | 10 | |
| 11 | 11 | use Doctrine\Common\Annotations\AnnotationReader; |
| 12 | -use samson\activerecord\dbMySQL; |
|
| 13 | -use samson\activerecord\dbQuery; |
|
| 14 | -use samson\url\URL; |
|
| 15 | 12 | use samsonframework\container\Builder; |
| 16 | 13 | use samsonframework\container\metadata\ClassMetadata; |
| 17 | 14 | use samsonframework\container\metadata\MethodMetadata; |
@@ -27,8 +24,6 @@ discard block |
||
| 27 | 24 | use samsonframework\core\PreparableInterface; |
| 28 | 25 | use samsonframework\core\SystemInterface; |
| 29 | 26 | use samsonframework\di\ContainerInterface; |
| 30 | -use samsonframework\orm\Database; |
|
| 31 | -use samsonframework\orm\Query; |
|
| 32 | 27 | use samsonframework\resource\ResourceMap; |
| 33 | 28 | use samsonphp\config\Scheme; |
| 34 | 29 | use samsonphp\core\exception\CannotLoadModule; |
@@ -36,7 +31,6 @@ discard block |
||
| 36 | 31 | use samsonphp\core\Module; |
| 37 | 32 | use samsonphp\event\Event; |
| 38 | 33 | use samsonframework\container\ContainerBuilderInterface; |
| 39 | -use stylelikeio\config\ActiveRecordConfig; |
|
| 40 | 34 | |
| 41 | 35 | /** |
| 42 | 36 | * SamsonPHP Core. |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | * |
| 39 | 39 | * @param mixed $module Указатель на модуль системы * |
| 40 | 40 | * |
| 41 | - * @return \samson\core\Module Текущую / Модель по её имени / или FALSE если модель не найдена |
|
| 41 | + * @return null|samsonphp\core\Module Текущую / Модель по её имени / или FALSE если модель не найдена |
|
| 42 | 42 | * @deprecated Use $this->system->module() in module context |
| 43 | 43 | */ |
| 44 | 44 | function &m($module = NULL) |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | /** |
| 73 | 73 | * Figure out if module view variable value is correctly set for view output |
| 74 | 74 | * |
| 75 | - * @param \samson\core\iModule $m Pointer to module |
|
| 75 | + * @param null|samsonphp\core\Module $m Pointer to module |
|
| 76 | 76 | * @param string $name View variable name |
| 77 | 77 | * @param mixed $value Value to compare |
| 78 | 78 | * |