@@ -33,7 +33,7 @@ |
||
| 33 | 33 | * @param null | string | array | \Traversable $value |
| 34 | 34 | * @throws Exception\InvalidArgumentException |
| 35 | 35 | */ |
| 36 | - public function __construct($key, $criteria, $value=null) |
|
| 36 | + public function __construct($key, $criteria, $value = null) |
|
| 37 | 37 | { |
| 38 | 38 | if (!$key) { |
| 39 | 39 | throw new Exception\InvalidArgumentException('Не задан ключ для создания Condition'); |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | |
| 59 | 59 | /** |
| 60 | 60 | * @param Conditions $conditions |
| 61 | - * @return mixed |
|
| 61 | + * @return AbstractAdapter |
|
| 62 | 62 | */ |
| 63 | 63 | public function setConditions(Conditions $conditions) |
| 64 | 64 | { |
@@ -37,6 +37,11 @@ |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
| 40 | + /** |
|
| 41 | + * @param string $key |
|
| 42 | + * |
|
| 43 | + * @return string |
|
| 44 | + */ |
|
| 40 | 45 | protected function checkOption($key, $options) |
| 41 | 46 | { |
| 42 | 47 | $option = null; |
@@ -105,7 +105,7 @@ |
||
| 105 | 105 | * @param GridPluginManager | ServiceLocatorInterface $serviceLocator |
| 106 | 106 | * @param $name |
| 107 | 107 | * @param $requestedName |
| 108 | - * @return mixed |
|
| 108 | + * @return GridInterface |
|
| 109 | 109 | * @throws Exception\RuntimeException |
| 110 | 110 | */ |
| 111 | 111 | public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName) |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName) |
| 37 | 37 | { |
| 38 | 38 | $res = false; |
| 39 | - if (strpos($requestedName, static::CONFIG_KEY . '.') === 0) { |
|
| 39 | + if (strpos($requestedName, static::CONFIG_KEY.'.') === 0) { |
|
| 40 | 40 | $res = true; |
| 41 | 41 | } |
| 42 | 42 | return $res; |
@@ -128,17 +128,17 @@ discard block |
||
| 128 | 128 | if ($gridsConfig === null || count($gridsConfig) === 0) { |
| 129 | 129 | throw new Exception\RuntimeException('В конфигурационном файле нет секции grids'); |
| 130 | 130 | } |
| 131 | - $gridName = substr($requestedName, strlen(self::CONFIG_KEY . '.')); |
|
| 131 | + $gridName = substr($requestedName, strlen(self::CONFIG_KEY.'.')); |
|
| 132 | 132 | if (!array_key_exists($gridName, $gridsConfig) || !$gridsConfig[$gridName]) { |
| 133 | 133 | throw new Exception\RuntimeException( |
| 134 | 134 | sprintf('Таблица с именем %s не найдена в конфиге гридов.', $gridName) |
| 135 | 135 | ); |
| 136 | 136 | } |
| 137 | - $gridConfig =& $gridsConfig[$gridName]; |
|
| 137 | + $gridConfig = & $gridsConfig[$gridName]; |
|
| 138 | 138 | if (!array_key_exists('class', $gridConfig) || !$gridConfig['class']) { |
| 139 | 139 | throw new Exception\RuntimeException('Необходимо задать класс таблицы в конфиге.'); |
| 140 | 140 | } |
| 141 | - $gridClass =& $gridConfig['class']; |
|
| 141 | + $gridClass = & $gridConfig['class']; |
|
| 142 | 142 | $options = []; |
| 143 | 143 | if (array_key_exists('options', $gridConfig) && $gridConfig['options']) { |
| 144 | 144 | if (!is_array($gridConfig['options']) && !$gridConfig['options'] instanceof ArrayAccess) { |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | * Create service |
| 21 | 21 | * |
| 22 | 22 | * @param ServiceLocatorInterface $serviceLocator |
| 23 | - * @return mixed |
|
| 23 | + * @return Action |
|
| 24 | 24 | */ |
| 25 | 25 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 26 | 26 | { |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function getConfig() |
| 49 | 49 | { |
| 50 | - return require __DIR__ . '/config/module.config.php'; |
|
| 50 | + return require __DIR__.'/config/module.config.php'; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | public function getAutoloaderConfig() |
| 59 | 59 | { |
| 60 | 60 | $config = []; |
| 61 | - $autoloadFile = __DIR__ . '/autoload_classmap.php'; |
|
| 61 | + $autoloadFile = __DIR__.'/autoload_classmap.php'; |
|
| 62 | 62 | if (file_exists($autoloadFile)) { |
| 63 | 63 | $config['Zend\Loader\ClassMapAutoloader'] = [ |
| 64 | 64 | $autoloadFile |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | $config['Zend\Loader\StandardAutoloader'] = [ |
| 68 | 68 | 'namespaces' => [ |
| 69 | - __NAMESPACE__ => __DIR__ . '/src' |
|
| 69 | + __NAMESPACE__ => __DIR__.'/src' |
|
| 70 | 70 | ] |
| 71 | 71 | ]; |
| 72 | 72 | return $config; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | public function init(ModuleManagerInterface $manager) |
| 105 | 105 | { |
| 106 | 106 | if (!$manager instanceof ModuleManager) { |
| 107 | - $errMsg =sprintf('Менеджер модулей должен реализовывать %s', ModuleManager::class); |
|
| 107 | + $errMsg = sprintf('Менеджер модулей должен реализовывать %s', ModuleManager::class); |
|
| 108 | 108 | throw new Exception\RuntimeException($errMsg); |
| 109 | 109 | } |
| 110 | 110 | /** @var ModuleManager $manager */ |
@@ -31,9 +31,9 @@ |
||
| 31 | 31 | ), |
| 32 | 32 | ), |
| 33 | 33 | 'view_manager' => [ |
| 34 | - 'template_map' => include __DIR__ . '/../template_map.php', |
|
| 34 | + 'template_map' => include __DIR__.'/../template_map.php', |
|
| 35 | 35 | 'template_path_stack' => [ |
| 36 | - 'mteGridGrid' => __DIR__ . '/../view', |
|
| 36 | + 'mteGridGrid' => __DIR__.'/../view', |
|
| 37 | 37 | ], |
| 38 | 38 | 'strategies' => [ |
| 39 | 39 | 'ViewJsonStrategy' |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | 'assetic_configuration' => [ |
| 11 | 11 | 'modules' => [ |
| 12 | 12 | 'Nnx\DataGrid' => [ |
| 13 | - 'root_path' => __DIR__ . '/../assets', |
|
| 13 | + 'root_path' => __DIR__.'/../assets', |
|
| 14 | 14 | 'collections' => [ |
| 15 | 15 | 'mtegrid_grid_images' => array( |
| 16 | 16 | 'assets' => array( |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | protected function setProperty($key, &$options) |
| 75 | 75 | { |
| 76 | 76 | if (array_key_exists($key, $options)) { |
| 77 | - $setter = 'set' . ucfirst($key); |
|
| 77 | + $setter = 'set'.ucfirst($key); |
|
| 78 | 78 | if (method_exists($this, $setter)) { |
| 79 | 79 | $this->$setter($options[$key]); |
| 80 | 80 | unset($options[$key]); |