@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $this->verbosePrint('Run import index', __METHOD__); |
| 129 | 129 | foreach (Yii::$app->getModules() as $id => $module) { |
| 130 | 130 | if ($module instanceof \luya\base\Module) { |
| 131 | - $this->verbosePrint('collect module importers from module: ' . $id, __METHOD__); |
|
| 131 | + $this->verbosePrint('collect module importers from module: '.$id, __METHOD__); |
|
| 132 | 132 | $response = $module->import($this); |
| 133 | 133 | if (is_array($response)) { // importer returns an array with class names |
| 134 | 134 | foreach ($response as $class) { |
@@ -150,9 +150,9 @@ discard block |
||
| 150 | 150 | ksort($queue); |
| 151 | 151 | |
| 152 | 152 | foreach ($queue as $pos => $object) { |
| 153 | - $this->verbosePrint("run object '" .$object->className() . " on pos $pos.", __METHOD__); |
|
| 153 | + $this->verbosePrint("run object '".$object->className()." on pos $pos.", __METHOD__); |
|
| 154 | 154 | $objectResponse = $object->run(); |
| 155 | - $this->verbosePrint("run object response: " . var_export($objectResponse, true), __METHOD__); |
|
| 155 | + $this->verbosePrint("run object response: ".var_export($objectResponse, true), __METHOD__); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | if (Yii::$app->hasModule('admin')) { |
@@ -160,21 +160,21 @@ discard block |
||
| 160 | 160 | Yii::$app->db->createCommand()->update('admin_user', ['force_reload' => 1])->execute(); |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - $this->verbosePrint('importer finished, get log output: ' . var_export($this->getLog(), true), __METHOD__); |
|
| 163 | + $this->verbosePrint('importer finished, get log output: '.var_export($this->getLog(), true), __METHOD__); |
|
| 164 | 164 | |
| 165 | 165 | foreach ($this->getLog() as $section => $value) { |
| 166 | - $this->outputInfo(PHP_EOL . $section . ":"); |
|
| 166 | + $this->outputInfo(PHP_EOL.$section.":"); |
|
| 167 | 167 | foreach ($value as $k => $v) { |
| 168 | 168 | if (is_array($v)) { |
| 169 | 169 | foreach ($v as $kk => $kv) { |
| 170 | 170 | if (is_array($kv)) { |
| 171 | - $this->output(" - {$kk}: " . print_r($kv, true)); |
|
| 171 | + $this->output(" - {$kk}: ".print_r($kv, true)); |
|
| 172 | 172 | } else { |
| 173 | 173 | $this->output(" - {$kk}: {$kv}"); |
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | } else { |
| 177 | - $this->output(" - " . $v); |
|
| 177 | + $this->output(" - ".$v); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -64,19 +64,19 @@ discard block |
||
| 64 | 64 | private function getExtraVarDef($type, $varName, $func) |
| 65 | 65 | { |
| 66 | 66 | $info = [ |
| 67 | - 'image-upload' => function ($varName) use ($func) { |
|
| 67 | + 'image-upload' => function($varName) use ($func) { |
|
| 68 | 68 | return '$this->zaaImageUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; |
| 69 | 69 | }, |
| 70 | - 'image-array-upload' => function ($varName) use ($func) { |
|
| 70 | + 'image-array-upload' => function($varName) use ($func) { |
|
| 71 | 71 | return '$this->zaaImageArrayUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; |
| 72 | 72 | }, |
| 73 | - 'file-upload' => function ($varName) use ($func) { |
|
| 73 | + 'file-upload' => function($varName) use ($func) { |
|
| 74 | 74 | return '$this->zaaFileUpload($this->'.$func.'(\''.$varName.'\'), true),'; |
| 75 | 75 | }, |
| 76 | - 'file-array-upload' => function ($varName) use ($func) { |
|
| 76 | + 'file-array-upload' => function($varName) use ($func) { |
|
| 77 | 77 | return '$this->zaaFileArrayUpload($this->'.$func.'(\''.$varName.'\'), true),'; |
| 78 | 78 | }, |
| 79 | - 'cms-page' => function ($varName) use ($func) { |
|
| 79 | + 'cms-page' => function($varName) use ($func) { |
|
| 80 | 80 | return 'Yii::$app->menu->findOne([\'nav_id\' => $this->'.$func.'(\''.$varName.'\', 0)]),'; |
| 81 | 81 | }, |
| 82 | 82 | ]; |
@@ -196,15 +196,15 @@ discard block |
||
| 196 | 196 | $content .= ' * @var bool Choose whether block is a layout/container/segmnet/section block or not, Container elements will be optically displayed'.PHP_EOL; |
| 197 | 197 | $content .= ' * in a different way for a better user experience. Container block will not display isDirty colorizing.'.PHP_EOL; |
| 198 | 198 | $content .= ' */'.PHP_EOL; |
| 199 | - $content .= ' public $isContainer = false;'.PHP_EOL . PHP_EOL; |
|
| 199 | + $content .= ' public $isContainer = false;'.PHP_EOL.PHP_EOL; |
|
| 200 | 200 | $content .= ' /**'.PHP_EOL; |
| 201 | 201 | $content .= ' * @var bool Choose whether a block can be cached trough the caching component. Be carefull with caching container blocks.'.PHP_EOL; |
| 202 | 202 | $content .= ' */'.PHP_EOL; |
| 203 | - $content .= ' public $cacheEnabled = false;'.PHP_EOL . PHP_EOL; |
|
| 203 | + $content .= ' public $cacheEnabled = false;'.PHP_EOL.PHP_EOL; |
|
| 204 | 204 | $content .= ' /**'.PHP_EOL; |
| 205 | 205 | $content .= ' * @var int The cache lifetime for this block in seconds (3600 = 1 hour), only affects when cacheEnabled is true'.PHP_EOL; |
| 206 | 206 | $content .= ' */'.PHP_EOL; |
| 207 | - $content .= ' public $cacheExpiration = 3600;'.PHP_EOL . PHP_EOL; |
|
| 207 | + $content .= ' public $cacheExpiration = 3600;'.PHP_EOL.PHP_EOL; |
|
| 208 | 208 | |
| 209 | 209 | // method name |
| 210 | 210 | $content .= ' public function name()'.PHP_EOL; |
@@ -34,19 +34,19 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - $appModulesFolder = Yii::$app->basePath . DIRECTORY_SEPARATOR . 'modules'; |
|
| 38 | - $moduleFolder = $appModulesFolder . DIRECTORY_SEPARATOR . $moduleName; |
|
| 37 | + $appModulesFolder = Yii::$app->basePath.DIRECTORY_SEPARATOR.'modules'; |
|
| 38 | + $moduleFolder = $appModulesFolder.DIRECTORY_SEPARATOR.$moduleName; |
|
| 39 | 39 | |
| 40 | 40 | if (file_exists($moduleFolder)) { |
| 41 | - return $this->outputError("The folder " . $moduleFolder . " exists already."); |
|
| 41 | + return $this->outputError("The folder ".$moduleFolder." exists already."); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $folders = [ |
| 45 | 45 | 'basePath' => $moduleFolder, |
| 46 | - 'adminPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin', |
|
| 47 | - 'frontendPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend', |
|
| 48 | - 'blocksPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'blocks', |
|
| 49 | - 'modelsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'models', |
|
| 46 | + 'adminPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin', |
|
| 47 | + 'frontendPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend', |
|
| 48 | + 'blocksPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'blocks', |
|
| 49 | + 'modelsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'models', |
|
| 50 | 50 | ]; |
| 51 | 51 | |
| 52 | 52 | $vars = ['folders' => $folders, 'name' => $moduleName, 'ns' => 'app\\modules\\'.$moduleName]; |
@@ -56,9 +56,9 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | $contents = [ |
| 59 | - $moduleFolder. DIRECTORY_SEPARATOR . 'README.md' => $this->view->render('@luya/console/commands/views/module/readme.php', $vars), |
|
| 60 | - $moduleFolder. DIRECTORY_SEPARATOR . 'admin/Module.php' => $this->view->render('@luya/console/commands/views/module/adminmodule.php', $vars), |
|
| 61 | - $moduleFolder. DIRECTORY_SEPARATOR . 'frontend/Module.php' => $this->view->render('@luya/console/commands/views/module/frontendmodule.php', $vars), |
|
| 59 | + $moduleFolder.DIRECTORY_SEPARATOR.'README.md' => $this->view->render('@luya/console/commands/views/module/readme.php', $vars), |
|
| 60 | + $moduleFolder.DIRECTORY_SEPARATOR.'admin/Module.php' => $this->view->render('@luya/console/commands/views/module/adminmodule.php', $vars), |
|
| 61 | + $moduleFolder.DIRECTORY_SEPARATOR.'frontend/Module.php' => $this->view->render('@luya/console/commands/views/module/frontendmodule.php', $vars), |
|
| 62 | 62 | ]; |
| 63 | 63 | |
| 64 | 64 | foreach ($contents as $fileName => $content) { |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | public function getWebroot() |
| 64 | 64 | { |
| 65 | 65 | if ($this->_webroot === null) { |
| 66 | - $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory); |
|
| 66 | + $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | return $this->_webroot; |
@@ -114,9 +114,9 @@ |
||
| 114 | 114 | $_file = $exception->getFile(); |
| 115 | 115 | $_line = $exception->getLine(); |
| 116 | 116 | } elseif (is_string($exception)) { |
| 117 | - $_message = 'exception string: ' . $exception; |
|
| 117 | + $_message = 'exception string: '.$exception; |
|
| 118 | 118 | } elseif (is_array($exception)) { |
| 119 | - $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true); |
|
| 119 | + $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: '.print_r($exception, true); |
|
| 120 | 120 | $_file = isset($exception['file']) ? $exception['file'] : __FILE__; |
| 121 | 121 | $_line = isset($exception['line']) ? $exception['line'] : __LINE__; |
| 122 | 122 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | |
| 63 | 63 | if (!is_object($this->tags[$tag])) { |
| 64 | 64 | $this->tags[$tag] = Yii::createObject($this->tags[$tag]); |
| 65 | - Yii::trace('tag parser object generated for:'. $tag, __CLASS__); |
|
| 65 | + Yii::trace('tag parser object generated for:'.$tag, __CLASS__); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $value = isset($context['value']) ? $context['value'] : false; |
@@ -100,7 +100,7 @@ |
||
| 100 | 100 | // see if the module has a registerComponents method |
| 101 | 101 | foreach ($module->registerComponents() as $componentId => $definition) { |
| 102 | 102 | if (!$app->has($componentId)) { |
| 103 | - Yii::trace('Register component ' . $componentId, __METHOD__); |
|
| 103 | + Yii::trace('Register component '.$componentId, __METHOD__); |
|
| 104 | 104 | $app->set($componentId, $definition); |
| 105 | 105 | } |
| 106 | 106 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function parse($value, $sub) |
| 17 | 17 | { |
| 18 | - return Html::a(empty($sub) ? $value : $sub, 'tel:' . $this->ensureNumber($value)); |
|
| 18 | + return Html::a(empty($sub) ? $value : $sub, 'tel:'.$this->ensureNumber($value)); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | private function ensureNumber($number) |
@@ -70,14 +70,14 @@ |
||
| 70 | 70 | */ |
| 71 | 71 | public function run() |
| 72 | 72 | { |
| 73 | - $class = 'lazy-image ' . $this->class; |
|
| 73 | + $class = 'lazy-image '.$this->class; |
|
| 74 | 74 | |
| 75 | 75 | if ($this->attributesOnly) { |
| 76 | 76 | return "class=\"{$class}\" data-src=\"$this->src\" data-width=\"$this->width\" data-height=\"$this->height\" data-as-background=\"1\""; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $tag = Html::tag('img', '', ['class' => $class, 'data-src' => $this->src, 'data-width' => $this->width, 'data-height' => $this->height]); |
| 80 | - $tag.= '<noscript><img class="'.$this->class.'" src="'.$this->src.'" /></noscript>'; |
|
| 80 | + $tag .= '<noscript><img class="'.$this->class.'" src="'.$this->src.'" /></noscript>'; |
|
| 81 | 81 | return $tag; |
| 82 | 82 | } |
| 83 | 83 | } |