@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | { |
| 46 | 46 | // check if properties is passed well |
| 47 | 47 | if ($properties !== null && !Obj::isArray($properties)) { |
| 48 | - throw new SyntaxException('Property must be passed as array or null! Field: ' . $name); |
|
| 48 | + throw new SyntaxException('Property must be passed as array or null! Field: '.$name); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // add properties to autovalidation by js (properties passed by ref) |
@@ -98,9 +98,9 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | // if field is unknown type add notification in debugbar |
| 100 | 100 | if (App::$Debug !== null) { |
| 101 | - App::$Debug->addMessage('Field with name [' . App::$Security->strip_tags($name) . '] have unknown type [' . $this->type . ']', 'error'); |
|
| 101 | + App::$Debug->addMessage('Field with name ['.App::$Security->strip_tags($name).'] have unknown type ['.$this->type.']', 'error'); |
|
| 102 | 102 | } |
| 103 | - return 'No data: ' . App::$Security->strip_tags($name); |
|
| 103 | + return 'No data: '.App::$Security->strip_tags($name); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -147,12 +147,12 @@ discard block |
||
| 147 | 147 | if (Str::contains('.', $name)) { |
| 148 | 148 | $splitedName = explode('.', $name); |
| 149 | 149 | foreach ($splitedName as $nameKey) { |
| 150 | - $properties['name'] .= '[' . $nameKey . ']'; |
|
| 151 | - $properties['id'] .= '-' . $nameKey; |
|
| 150 | + $properties['name'] .= '['.$nameKey.']'; |
|
| 151 | + $properties['id'] .= '-'.$nameKey; |
|
| 152 | 152 | } |
| 153 | 153 | } else { // standard property definition - add field name |
| 154 | - $properties['name'] .= '[' . $name . ']'; |
|
| 155 | - $properties['id'] .= '-' . $name; |
|
| 154 | + $properties['name'] .= '['.$name.']'; |
|
| 155 | + $properties['id'] .= '-'.$name; |
|
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | \ No newline at end of file |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | try { |
| 178 | 178 | /** @var \Ffcms\Core\Arch\Controller $callClass */ |
| 179 | 179 | $callClass = null; |
| 180 | - $callMethod = 'action' . self::$Request->getAction(); |
|
| 180 | + $callMethod = 'action'.self::$Request->getAction(); |
|
| 181 | 181 | |
| 182 | 182 | // founded callback injection alias |
| 183 | 183 | if (self::$Request->getCallbackAlias() !== false) { |
@@ -185,16 +185,16 @@ discard block |
||
| 185 | 185 | if (class_exists($cName)) { |
| 186 | 186 | $callClass = new $cName; |
| 187 | 187 | } else { |
| 188 | - throw new NotFoundException('Callback alias of class "' . App::$Security->strip_tags($cName) . '" is not founded'); |
|
| 188 | + throw new NotFoundException('Callback alias of class "'.App::$Security->strip_tags($cName).'" is not founded'); |
|
| 189 | 189 | } |
| 190 | 190 | } else { // typical parsing of native apps |
| 191 | - $cName = '\Apps\Controller\\' . env_name . '\\' . self::$Request->getController(); |
|
| 191 | + $cName = '\Apps\Controller\\'.env_name.'\\'.self::$Request->getController(); |
|
| 192 | 192 | |
| 193 | 193 | // try to initialize class object |
| 194 | 194 | if (class_exists($cName)) { |
| 195 | 195 | $callClass = new $cName; |
| 196 | 196 | } else { |
| 197 | - throw new NotFoundException('Application can not be runned. Initialized class not founded: ' . App::$Security->strip_tags($cName)); |
|
| 197 | + throw new NotFoundException('Application can not be runned. Initialized class not founded: '.App::$Security->strip_tags($cName)); |
|
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | // build full compiled output html data |
| 239 | 239 | $html = $callClass->buildOutput(); |
| 240 | 240 | } else { |
| 241 | - throw new NotFoundException('Method "' . App::$Security->strip_tags($callMethod) . '()" not founded in "' . get_class($callClass) . '"'); |
|
| 241 | + throw new NotFoundException('Method "'.App::$Security->strip_tags($callMethod).'()" not founded in "'.get_class($callClass).'"'); |
|
| 242 | 242 | } |
| 243 | 243 | } catch (NotFoundException $e) { // catch exceptions and set output |
| 244 | 244 | $html = $e->display(); |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // try to load from file |
| 45 | - $configFile = ucfirst(Str::lowerCase($configName)) . '.php'; |
|
| 46 | - if (File::exist('/Private/Config/' . $configFile)) { |
|
| 47 | - $this->data[$configName] = File::inc('/Private/Config/' . $configFile, true); |
|
| 45 | + $configFile = ucfirst(Str::lowerCase($configName)).'.php'; |
|
| 46 | + if (File::exist('/Private/Config/'.$configFile)) { |
|
| 47 | + $this->data[$configName] = File::inc('/Private/Config/'.$configFile, true); |
|
| 48 | 48 | return true; |
| 49 | 49 | } |
| 50 | 50 | |
@@ -141,11 +141,11 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | public function writeConfig($configFile, array $data) |
| 143 | 143 | { |
| 144 | - $path = '/Private/Config/' . ucfirst(Str::lowerCase($configFile)) . '.php'; |
|
| 144 | + $path = '/Private/Config/'.ucfirst(Str::lowerCase($configFile)).'.php'; |
|
| 145 | 145 | if (!File::exist($path) || !File::writable($path)) { |
| 146 | 146 | return false; |
| 147 | 147 | } |
| 148 | - $saveData = '<?php return ' . Arr::exportVar($data) . ';'; |
|
| 148 | + $saveData = '<?php return '.Arr::exportVar($data).';'; |
|
| 149 | 149 | File::write($path, $saveData); |
| 150 | 150 | // overload config values if changed |
| 151 | 151 | $this->load($configFile, true); |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | if ($this->layout === null) { |
| 61 | 61 | $content = $this->output; |
| 62 | 62 | } else { |
| 63 | - $layoutPath = App::$Alias->currentViewPath . '/layout/' . $this->layout . '.php'; |
|
| 63 | + $layoutPath = App::$Alias->currentViewPath.'/layout/'.$this->layout.'.php'; |
|
| 64 | 64 | if (!File::exist($layoutPath)) { |
| 65 | - throw new NativeException('Layout not founded: ' . $layoutPath); |
|
| 65 | + throw new NativeException('Layout not founded: '.$layoutPath); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $body = $this->output; |
@@ -81,14 +81,14 @@ discard block |
||
| 81 | 81 | // set custom css library's not included on static call |
| 82 | 82 | $cssIncludeCode = App::$View->showCodeLink('css'); |
| 83 | 83 | if (!Str::likeEmpty($cssIncludeCode)) { |
| 84 | - $content = Str::replace('</head>', $cssIncludeCode . '</head>', $content); |
|
| 84 | + $content = Str::replace('</head>', $cssIncludeCode.'</head>', $content); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | // add debug bar |
| 88 | 88 | if (App::$Debug !== null) { |
| 89 | 89 | $content = Str::replace( |
| 90 | 90 | ['</body>', '</head>'], |
| 91 | - [App::$Debug->renderOut() . '</body>', App::$Debug->renderHead() . '</head>'], |
|
| 91 | + [App::$Debug->renderOut().'</body>', App::$Debug->renderHead().'</head>'], |
|
| 92 | 92 | $content); |
| 93 | 93 | } |
| 94 | 94 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | // set mobile collapse id for toggle |
| 38 | 38 | $mobCollapseId = $elements['collapseId']; |
| 39 | 39 | if (Str::likeEmpty($mobCollapseId)) { |
| 40 | - $mobCollapseId = Str::randomLatin(mt_rand(6,12)) . mt_rand(1, 99); |
|
| 40 | + $mobCollapseId = Str::randomLatin(mt_rand(6, 12)).mt_rand(1, 99); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // set element id for toggle |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | // generate output dom of bootstrap navbar |
| 100 | 100 | $dom = new Dom(); |
| 101 | 101 | $body = $dom->div(function() use ($leftBuild, $rightBuild, $itemsStatic){ |
| 102 | - return $leftBuild . $itemsStatic . $rightBuild; |
|
| 102 | + return $leftBuild.$itemsStatic.$rightBuild; |
|
| 103 | 103 | }, ['class' => 'collapse navbar-collapse', 'id' => $mobCollapseId]); |
| 104 | 104 | |
| 105 | 105 | // drow <nav @properties>@next</nav> |
@@ -110,17 +110,17 @@ discard block |
||
| 110 | 110 | $header = $dom->div(function() use ($dom, $elements, $mobCollapseId){ |
| 111 | 111 | // drow <button @collapse>@next</button> |
| 112 | 112 | $collapseButton = $dom->button(function() use ($dom){ |
| 113 | - $toggleItem = $dom->span(function(){ |
|
| 113 | + $toggleItem = $dom->span(function() { |
|
| 114 | 114 | return 'Toggle menu'; |
| 115 | 115 | }, ['class' => 'sr-only']); |
| 116 | 116 | $toggleIcon = null; |
| 117 | 117 | for ($i = 0; $i < 3; $i++) { |
| 118 | - $toggleIcon .= $dom->span(function(){ |
|
| 118 | + $toggleIcon .= $dom->span(function() { |
|
| 119 | 119 | return null; |
| 120 | 120 | }, ['class' => 'icon-bar']); |
| 121 | 121 | } |
| 122 | - return $toggleItem . $toggleIcon; |
|
| 123 | - }, ['type' => 'button', 'class' => 'navbar-toggle collapsed', 'data-toggle' => 'collapse', 'data-target' => '#' . $mobCollapseId]); |
|
| 122 | + return $toggleItem.$toggleIcon; |
|
| 123 | + }, ['type' => 'button', 'class' => 'navbar-toggle collapsed', 'data-toggle' => 'collapse', 'data-target' => '#'.$mobCollapseId]); |
|
| 124 | 124 | // drow <div @brand>@brandtext<?div> |
| 125 | 125 | $brand = null; |
| 126 | 126 | if (isset($elements['brand'])) { |
@@ -135,10 +135,10 @@ discard block |
||
| 135 | 135 | }, $elements['brand']['property']); |
| 136 | 136 | } |
| 137 | 137 | } |
| 138 | - return $collapseButton . $brand; |
|
| 138 | + return $collapseButton.$brand; |
|
| 139 | 139 | }, ['class' => 'navbar-header']); |
| 140 | 140 | // return header and body concat |
| 141 | - return $header . $body; |
|
| 141 | + return $header.$body; |
|
| 142 | 142 | }, $elements['container']); |
| 143 | 143 | }, $elements['nav']); |
| 144 | 144 | } |
@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | $basePath = trim(App::$Properties->get('basePath'), '/'); |
| 62 | 62 | if ($basePath !== null && Str::length($basePath) > 0) { |
| 63 | - $basePath = '/' . $basePath; |
|
| 63 | + $basePath = '/'.$basePath; |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | if (!defined('env_no_uri') || env_no_uri === false) { |
| 67 | - $basePath .= '/' . strtolower(env_name); |
|
| 67 | + $basePath .= '/'.strtolower(env_name); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // we never try to use path's without friendly url's |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | } else { |
| 91 | 91 | // try to find language in pathway |
| 92 | 92 | foreach (App::$Properties->get('languages') as $lang) { |
| 93 | - if (Str::startsWith('/' . $lang, $this->getPathInfo())) { |
|
| 93 | + if (Str::startsWith('/'.$lang, $this->getPathInfo())) { |
|
| 94 | 94 | $this->language = $lang; |
| 95 | 95 | $this->languageInPath = true; |
| 96 | 96 | } |
@@ -117,11 +117,11 @@ discard block |
||
| 117 | 117 | // parse query string |
| 118 | 118 | $queryString = null; |
| 119 | 119 | if (count($this->query->all()) > 0) { |
| 120 | - $queryString = '?' . http_build_query($this->query->all()); |
|
| 120 | + $queryString = '?'.http_build_query($this->query->all()); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | // build response with redirect to language-based path |
| 124 | - $response = new Redirect($this->getSchemeAndHttpHost() . $this->basePath . '/' . $userLang . $this->getPathInfo() . $queryString); |
|
| 124 | + $response = new Redirect($this->getSchemeAndHttpHost().$this->basePath.'/'.$userLang.$this->getPathInfo().$queryString); |
|
| 125 | 125 | $response->send(); |
| 126 | 126 | exit(); |
| 127 | 127 | } |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | if (array_key_exists($pathway, $routing['Redirect'])) { |
| 181 | 181 | $target = $this->getSchemeAndHttpHost(); // . $this->getBasePath() . '/' . rtrim($routing['Redirect'][$pathway], '/'); |
| 182 | 182 | if ($this->getBasePath() !== null && !Str::likeEmpty($this->getBasePath())) { |
| 183 | - $target .= '/' . $this->getBasePath(); |
|
| 183 | + $target .= '/'.$this->getBasePath(); |
|
| 184 | 184 | } |
| 185 | 185 | $target .= rtrim($routing['Redirect'][$pathway], '/'); |
| 186 | 186 | $redirect = new Redirect($target); |
@@ -206,9 +206,9 @@ discard block |
||
| 206 | 206 | // find "new path" as binding uri slug |
| 207 | 207 | $binding = array_search($pathway, $map, true); |
| 208 | 208 | // build url to redirection |
| 209 | - $url = $this->getSchemeAndHttpHost() . $this->getBasePath() . '/'; |
|
| 209 | + $url = $this->getSchemeAndHttpHost().$this->getBasePath().'/'; |
|
| 210 | 210 | if (App::$Properties->get('multiLanguage')) { |
| 211 | - $url .= $this->language . '/'; |
|
| 211 | + $url .= $this->language.'/'; |
|
| 212 | 212 | } |
| 213 | 213 | $url .= ltrim($binding, '/'); |
| 214 | 214 | |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | { |
| 303 | 303 | $route = $this->languageInPath ? Str::sub(parent::getPathInfo(), Str::length($this->language) + 1) : parent::getPathInfo(); |
| 304 | 304 | if (!Str::startsWith('/', $route)) { |
| 305 | - $route = '/' . $route; |
|
| 305 | + $route = '/'.$route; |
|
| 306 | 306 | } |
| 307 | 307 | return $route; |
| 308 | 308 | } |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | */ |
| 428 | 428 | public function getFullUrl() |
| 429 | 429 | { |
| 430 | - return $this->getSchemeAndHttpHost() . $this->getRequestUri(); |
|
| 430 | + return $this->getSchemeAndHttpHost().$this->getRequestUri(); |
|
| 431 | 431 | } |
| 432 | 432 | |
| 433 | 433 | /** |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | $purifier = App::$Memory->get('object.purifier.helpers'); |
| 24 | 24 | } else { |
| 25 | 25 | $config = \HTMLPurifier_Config::createDefault(); |
| 26 | - $config->set('Cache.SerializerPath', root . '/Private/Cache/HTMLPurifier/'); |
|
| 26 | + $config->set('Cache.SerializerPath', root.'/Private/Cache/HTMLPurifier/'); |
|
| 27 | 27 | $config->set('AutoFormat.AutoParagraph', false); |
| 28 | 28 | |
| 29 | 29 | // allow use target=_blank for links |
@@ -65,9 +65,9 @@ discard block |
||
| 65 | 65 | $build = null; |
| 66 | 66 | foreach ($property as $p => $v) { |
| 67 | 67 | if ($v === null || $v === false || $v === true) { |
| 68 | - $build .= ' ' . self::nohtml($p); |
|
| 68 | + $build .= ' '.self::nohtml($p); |
|
| 69 | 69 | } else { |
| 70 | - $build .= ' ' . self::nohtml($p) . '="' . self::nohtml($v) . '"'; |
|
| 70 | + $build .= ' '.self::nohtml($p).'="'.self::nohtml($v).'"'; |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | return $build; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | public static function buildSingleTag($tagName, array $property = null, $closeSlash = true) |
| 84 | 84 | { |
| 85 | - return '<' . self::nohtml($tagName) . self::applyProperty($property) . ($closeSlash ? '/>' : '>'); |
|
| 85 | + return '<'.self::nohtml($tagName).self::applyProperty($property).($closeSlash ? '/>' : '>'); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $value = self::nohtml($value); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - return '<' . $tagName . self::applyProperty($property) . '>' . $value . '</' . $tagName . '>'; |
|
| 103 | + return '<'.$tagName.self::applyProperty($property).'>'.$value.'</'.$tagName.'>'; |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | if (!Str::contains('/', $elementPoint) || count($elementArray) < 2) { |
| 143 | 143 | $active = $elementPoint === $currentPoint; |
| 144 | 144 | } else { |
| 145 | - $elementPoint = $elementArray[0] . '/' . $elementArray[1]; |
|
| 145 | + $elementPoint = $elementArray[0].'/'.$elementArray[1]; |
|
| 146 | 146 | $active = Str::startsWith($elementPoint, $currentPoint); |
| 147 | 147 | } |
| 148 | 148 | break; |
| 149 | 149 | case 'id': |
| 150 | 150 | $elementArray = explode('/', $elementPoint); |
| 151 | - $elementPoint = $elementArray[0] . '/' . $elementArray[1]; |
|
| 151 | + $elementPoint = $elementArray[0].'/'.$elementArray[1]; |
|
| 152 | 152 | if ($elementArray[2] === null) { // looks like id is not defined in element |
| 153 | 153 | if (Str::contains('?', $currentPoint)) { |
| 154 | 154 | $currentPoint = Str::firstIn($currentPoint, '?'); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | $currentToId = implode('/', array_slice($currentArray, 0, 3)); |
| 158 | 158 | $active = $elementPoint === $currentToId; |
| 159 | 159 | } else { |
| 160 | - $elementPoint .= '/' . $elementArray[2]; |
|
| 160 | + $elementPoint .= '/'.$elementArray[2]; |
|
| 161 | 161 | $active = Str::startsWith($elementPoint, $currentPoint); |
| 162 | 162 | } |
| 163 | 163 | break; |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public static function convertLink($uri) |
| 214 | 214 | { |
| 215 | - $link = App::$Alias->baseUrl . '/'; |
|
| 215 | + $link = App::$Alias->baseUrl.'/'; |
|
| 216 | 216 | if (Obj::isArray($uri)) { |
| 217 | 217 | $link .= Url::buildPathway($uri); |
| 218 | 218 | } elseif (Str::startsWith('http', $uri)) { |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | */ |
| 233 | 233 | public static function encode($uri) |
| 234 | 234 | { |
| 235 | - return implode('/', array_map(function($v){ |
|
| 235 | + return implode('/', array_map(function($v) { |
|
| 236 | 236 | return urlencode($v); |
| 237 | 237 | }, explode('/', $uri))); |
| 238 | 238 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | } elseif (method_exists($class, $obj)) { // maybe its a function? |
| 139 | 139 | $class = $class::$obj; // call function |
| 140 | 140 | } else { |
| 141 | - throw new SyntaxException('Filter callback execution failed: ' . $filterName); |
|
| 141 | + throw new SyntaxException('Filter callback execution failed: '.$filterName); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | if (method_exists($class, $method)) { |
| 149 | 149 | $check = @$class::$method($fieldValue, $filterArgs); |
| 150 | 150 | } else { |
| 151 | - throw new SyntaxException('Filter callback execution failed: ' . $filterName); |
|
| 151 | + throw new SyntaxException('Filter callback execution failed: '.$filterName); |
|
| 152 | 152 | } |
| 153 | 153 | } elseif (method_exists('Ffcms\Core\Helper\ModelFilters', $filterName)) { // only full namespace\class path based :( |
| 154 | 154 | if ($filterArgs != null) { |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | $check = ModelFilters::$filterName($fieldValue); |
| 158 | 158 | } |
| 159 | 159 | } else { |
| 160 | - throw new SyntaxException('Filter "' . $filterName . '" is not exist'); |
|
| 160 | + throw new SyntaxException('Filter "'.$filterName.'" is not exist'); |
|
| 161 | 161 | } |
| 162 | 162 | if ($check !== true) { // if one from all validation tests is fail - mark as incorrect attribute |
| 163 | 163 | $this->_badAttr[] = $propertyName; |
@@ -323,10 +323,10 @@ discard block |
||
| 323 | 323 | $paramQuery = $this->getFormName(); |
| 324 | 324 | if (Str::contains('.', $param)) { |
| 325 | 325 | foreach (explode('.', $param) as $item) { |
| 326 | - $paramQuery .= '[' . $item . ']'; |
|
| 326 | + $paramQuery .= '['.$item.']'; |
|
| 327 | 327 | } |
| 328 | 328 | } else { |
| 329 | - $paramQuery .= '[' . $param . ']'; |
|
| 329 | + $paramQuery .= '['.$param.']'; |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | if ($method === null) { |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | } |
| 36 | 36 | // get image link |
| 37 | 37 | $image = App::$Captcha->get(); |
| 38 | - $response = '<img id="src-secure-image" src="' . $image . '" alt="captcha" onClick="this.src=\''.$image.'&rnd=\'+Math.random()" />'; |
|
| 38 | + $response = '<img id="src-secure-image" src="'.$image.'" alt="captcha" onClick="this.src=\''.$image.'&rnd=\'+Math.random()" />'; |
|
| 39 | 39 | // render response tag with image |
| 40 | 40 | $this->properties['type'] = 'text'; |
| 41 | 41 | $response .= self::buildSingleTag('input', $this->properties); |