@@ -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 | */ |
@@ -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 | * |
@@ -450,7 +450,7 @@ |
||
| 450 | 450 | |
| 451 | 451 | //[PHPCOMPRESSOR(remove,end)] |
| 452 | 452 | |
| 453 | - /** @return \Container Get system container */ |
|
| 453 | + /** @return ContainerInterface Get system container */ |
|
| 454 | 454 | public function getContainer() |
| 455 | 455 | { |
| 456 | 456 | return $this->container; |
@@ -8,36 +8,14 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | namespace samson\core; |
| 10 | 10 | |
| 11 | -use Doctrine\Common\Annotations\AnnotationReader; |
|
| 12 | -use samsonframework\container\Builder; |
|
| 13 | 11 | use samsonframework\container\ContainerBuilderInterface; |
| 14 | 12 | use samsonframework\container\ContainerInterface; |
| 15 | 13 | use samsonframework\container\definition\analyzer\annotation\annotation\InjectService; |
| 16 | 14 | use samsonframework\container\metadata\ClassMetadata; |
| 17 | -use samsonframework\container\metadata\MethodMetadata; |
|
| 18 | -use samsonframework\container\metadata\PropertyMetadata; |
|
| 19 | -use samsonframework\containerannotation\AnnotationClassResolver; |
|
| 20 | -use samsonframework\containerannotation\AnnotationMetadataCollector; |
|
| 21 | -use samsonframework\containerannotation\AnnotationMethodResolver; |
|
| 22 | -use samsonframework\containerannotation\AnnotationPropertyResolver; |
|
| 23 | -use samsonframework\containerannotation\AnnotationResolver; |
|
| 24 | -use samsonframework\containerannotation\Injectable; |
|
| 25 | 15 | use samsonframework\containerannotation\InjectArgument; |
| 26 | -use samsonframework\containercollection\attribute\ArrayValue; |
|
| 27 | -use samsonframework\containercollection\attribute\ClassName; |
|
| 28 | -use samsonframework\containercollection\attribute\Name; |
|
| 29 | -use samsonframework\containercollection\attribute\Value; |
|
| 30 | -use samsonframework\containercollection\CollectionClassResolver; |
|
| 31 | -use samsonframework\containercollection\CollectionMethodResolver; |
|
| 32 | -use samsonframework\containercollection\CollectionParameterResolver; |
|
| 33 | -use samsonframework\containercollection\CollectionPropertyResolver; |
|
| 34 | -use samsonframework\containerxml\XmlMetadataCollector; |
|
| 35 | -use samsonframework\containerxml\XmlResolver; |
|
| 36 | -use samsonframework\core\PreparableInterface; |
|
| 37 | 16 | use samsonframework\core\SystemInterface; |
| 38 | 17 | use samsonframework\resource\ResourceMap; |
| 39 | 18 | use samsonphp\config\Scheme; |
| 40 | -use samsonphp\core\exception\CannotLoadModule; |
|
| 41 | 19 | use samsonphp\core\exception\ViewPathNotFound; |
| 42 | 20 | use samsonphp\core\Module; |
| 43 | 21 | use samsonphp\event\Event; |
@@ -29,7 +29,6 @@ |
||
| 29 | 29 | use samsonframework\containercollection\CollectionPropertyResolver; |
| 30 | 30 | use samsonframework\containerxml\XmlMetadataCollector; |
| 31 | 31 | use samsonframework\containerxml\XmlResolver; |
| 32 | -use samsonframework\core\SystemInterface; |
|
| 33 | 32 | use samsonframework\resource\ResourceMap; |
| 34 | 33 | |
| 35 | 34 | /** |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | /** |
| 190 | 190 | * Prepare modules |
| 191 | 191 | * |
| 192 | - * @param array $modules |
|
| 192 | + * @param Module[] $modules |
|
| 193 | 193 | * @param $container |
| 194 | 194 | */ |
| 195 | 195 | protected function prepareModules(array $modules, $container) |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | * Define constructor |
| 232 | 232 | * |
| 233 | 233 | * @param ClassDefinition $classDefinition |
| 234 | - * @param $path |
|
| 234 | + * @param string $path |
|
| 235 | 235 | * @throws MethodDefinitionAlreadyExistsException |
| 236 | 236 | */ |
| 237 | 237 | protected function defineConstructor(ClassDefinition $classDefinition, $path) |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | * Get module id |
| 248 | 248 | * |
| 249 | 249 | * @param $filePath |
| 250 | - * @return string|bool |
|
| 250 | + * @return string|false |
|
| 251 | 251 | */ |
| 252 | 252 | protected function getModuleId($filePath) |
| 253 | 253 | { |
@@ -3,10 +3,8 @@ discard block |
||
| 3 | 3 | namespace samsonphp\core\loader; |
| 4 | 4 | |
| 5 | 5 | use Doctrine\Common\Annotations\AnnotationReader; |
| 6 | -use samson\activerecord\dbMySQLConnector; |
|
| 7 | 6 | use samson\core\CompressableExternalModule; |
| 8 | 7 | use samson\core\CompressableService; |
| 9 | -use samson\core\Core; |
|
| 10 | 8 | use samson\core\ExternalModule; |
| 11 | 9 | use samson\core\VirtualModule; |
| 12 | 10 | use samsonframework\container\definition\analyzer\annotation\annotation\InjectClass; |
@@ -28,11 +26,9 @@ discard block |
||
| 28 | 26 | use samsonframework\container\definition\exception\MethodDefinitionAlreadyExistsException; |
| 29 | 27 | use samsonframework\container\definition\parameter\ParameterBuilder; |
| 30 | 28 | use samsonframework\container\definition\reference\ClassReference; |
| 31 | -use samsonframework\container\definition\reference\ServiceReference; |
|
| 32 | 29 | use samsonframework\container\definition\reference\StringReference; |
| 33 | 30 | use samsonframework\container\definition\resolver\xml\XmlResolver; |
| 34 | 31 | use samsonframework\container\definition\scope\ModuleScope; |
| 35 | -use samsonframework\container\definition\scope\ServiceScope; |
|
| 36 | 32 | use samsonframework\core\PreparableInterface; |
| 37 | 33 | use samsonframework\di\Container; |
| 38 | 34 | use samsonframework\generator\ClassGenerator; |
@@ -40,7 +36,6 @@ discard block |
||
| 40 | 36 | use samsonphp\core\loader\module\Module; |
| 41 | 37 | use samsonphp\core\loader\module\ModuleManagerInterface; |
| 42 | 38 | use samsonphp\event\Event; |
| 43 | -use samsonphp\i18n\i18n; |
|
| 44 | 39 | |
| 45 | 40 | /** |
| 46 | 41 | * Class CoreLoader |