linpax / microphp-framework

web/Response.php

Spacing +3 added lines, -3 removed lines

@@ -227,12 +227,12 @@
     public function sendHeaders()
     {
         $message = $this->statusMessage ?: $this->getStatusMessageFromCode($this->statusCode);
-        header($this->httpVersion . ' ' . $this->statusCode . ' ' . $message);
+        header($this->httpVersion.' '.$this->statusCode.' '.$message);
 
-        header('Content-Type: ' . $this->contentType);
+        header('Content-Type: '.$this->contentType);
 
         foreach ($this->headers AS $key => $val) {
-            header($key . ': ' . $val);
+            header($key.': '.$val);
         }
 
     }

web/Router.php

Spacing +4 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
         $result .= '?';
         foreach ($attributes AS $key => $val) {
             if ($key !== $val) {
-                $result .= '&' . $key . '=' . $val;
+                $result .= '&'.$key.'='.$val;
             }
         }
 
@@ -136,7 +136,7 @@ 
             if (0 === strpos($patBlocks[$i], '<')) {
                 $cut = strpos($patBlocks[$i], ':');
 
-                if (preg_match('/' . substr($patBlocks[$i], $cut + 1, -1) . '/', $uriBlocks[$i])) {
+                if (preg_match('/'.substr($patBlocks[$i], $cut + 1, -1).'/', $uriBlocks[$i])) {
                     $attr[substr($patBlocks[$i], 1, $cut - 1)] = $uriBlocks[$i];
                 } else {
                     return false;
@@ -168,14 +168,14 @@ 
 
         foreach ($repBlocks AS $value) {
             if (0 !== strpos($value, '<')) {
-                $result .= '/' . $value;
+                $result .= '/'.$value;
 
                 unset($attr[$value]);
             } else {
                 $element = substr($value, 1, -1);
 
                 if (!empty($attr[$element])) {
-                    $result .= '/' . $attr[$element];
+                    $result .= '/'.$attr[$element];
 
                     unset($attr[$element]);
                 } else {

base/FatalError.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
      */
     protected static function doCli()
     {
-        return static::$number . ' - ' . static::$message . ' on ' . static::$file . ':' . static::$line;
+        return static::$number.' - '.static::$message.' on '.static::$file.':'.static::$line;
     }
 
     /**
@@ -65,20 +65,20 @@ 
     protected static function doRun()
     {
         $str = '<div class="error" style="width: 100%;">';
-        $str .= '<h2>FatalError ' . static::$number . ' - ' . static::$message . ' on ' . static::$file . ':' . static::$line . '</h2>';
+        $str .= '<h2>FatalError '.static::$number.' - '.static::$message.' on '.static::$file.':'.static::$line.'</h2>';
 
         $str .= '<table width="100%" style="width: 100%">';
         $str .= '<tr>';
         $str .= '<th width="100px">Context</th>';
         $str .= '<td style="vertical-align: top; height: 300px">';
-        $str .= '<textarea disabled style="width:100%; height: 100%">' . print_r(static::$context,
-                true) . '</textarea>';
+        $str .= '<textarea disabled style="width:100%; height: 100%">'.print_r(static::$context,
+                true).'</textarea>';
         $str .= '</td>';
         $str .= '</tr>';
         $str .= '<tr>';
         $str .= '<th width="100px">Debug trace</th>';
         $str .= '<td style="vertical-align: top; height: 300px">';
-        $str .= '<textarea disabled style="width: 100%; height: 100%">' . print_r(static::$trace, true) . '</textarea>';
+        $str .= '<textarea disabled style="width: 100%; height: 100%">'.print_r(static::$trace, true).'</textarea>';
         $str .= '</td>';
         $str .= '</tr>';
         $str .= '</table>';

base/Autoload.php

Spacing +2 added lines, -2 removed lines

@@ -96,8 +96,8 @@
                 continue;
             }
 
-            $path = $alias . '\\' . substr($className, mb_strlen($prefix) + 1);
-            $absolutePath = str_replace('\\', DIRECTORY_SEPARATOR, $path) . $extension;
+            $path = $alias.'\\'.substr($className, mb_strlen($prefix) + 1);
+            $absolutePath = str_replace('\\', DIRECTORY_SEPARATOR, $path).$extension;
 
             if (is_readable($absolutePath)) {
                 return $absolutePath;

form/FormModel.php

Spacing +2 added lines, -2 removed lines

@@ -76,11 +76,11 @@
         foreach ($this->rules() AS $rule) {
             $validator = new Validator(['container' => $this->container, 'rule' => $rule]);
             if (is_string($js = $validator->run($this, true))) {
-                $result .= ' ' . $js;
+                $result .= ' '.$js;
             }
         }
 
-        return $result . '});';
+        return $result.'});';
     }
 
     /**

form/FormBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
             }
         }
         foreach ($this->config['buttons'] AS $button) {
-            $type = $button['type'] . 'Button';
+            $type = $button['type'].'Button';
             echo Html::$type($button['label'], !empty($button['options']) ? $button['options'] : []);
         }
     }

form/Form.php

Spacing +71 added lines, -71 removed lines

@@ -52,8 +52,8 @@ 
         $smallName = substr($cl, strrpos($cl, '\\') + 1);
 
         return [
-            'id' => $smallName . '_' . $property,
-            'name' => $smallName . '[' . $property . ']',
+            'id' => $smallName.'_'.$property,
+            'name' => $smallName.'['.$property.']',
             'value' => property_exists($model, $property) ? $model->$property : null
         ];
     }
@@ -130,9 +130,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->textField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->textField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -194,9 +194,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->fileField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->fileField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -235,9 +235,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->imageField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->imageField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -277,9 +277,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->passwordField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->passwordField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -318,9 +318,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->textAreaField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->textAreaField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -359,9 +359,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->checkBoxField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->checkBoxField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -402,9 +402,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->listBoxField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->listBoxField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -448,9 +448,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->dropDownListField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->dropDownListField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -493,9 +493,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->checkBoxListField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->checkBoxListField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -535,9 +535,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->radioButtonListField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->radioButtonListField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -579,9 +579,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->colorField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->colorField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -620,9 +620,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->dateField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->dateField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -661,9 +661,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->dateTimeField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->dateTimeField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -702,9 +702,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->dateTimeLocalField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->dateTimeLocalField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -743,9 +743,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->emailField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->emailField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -784,9 +784,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->numberField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->numberField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -825,9 +825,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->rangeField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->rangeField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -866,9 +866,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->searchField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->searchField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -907,9 +907,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->telField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->telField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -948,9 +948,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->timeField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->timeField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -989,9 +989,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->urlField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->urlField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -1030,9 +1030,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->monthField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->monthField($model, $property, $options).
         Html::closeTag('div');
     }
 
@@ -1071,9 +1071,9 @@ 
         $element = $this->getField($model, $property);
         $options['id'] = $element['id'];
 
-        return Html::openTag('div', $this->getBlock('block', $options)) .
-        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)) .
-        $this->weekField($model, $property, $options) .
+        return Html::openTag('div', $this->getBlock('block', $options)).
+        Html::label($model->getLabel($property), $element['id'], $this->getBlock('label', $options)).
+        $this->weekField($model, $property, $options).
         Html::closeTag('div');
     }
 

mail/Message.php

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
      */
     public function setSubject($text)
     {
-        $this->subject = '=?utf-8?B?' . base64_encode($text) . '?=';
+        $this->subject = '=?utf-8?B?'.base64_encode($text).'?=';
     }
 
     /**
@@ -117,7 +117,7 @@ 
      */
     public function setHeaders($name, $value)
     {
-        $this->headers[$name] = $name . ': ' . $value;
+        $this->headers[$name] = $name.': '.$value;
     }
 
     /**
@@ -129,7 +129,7 @@ 
             return false;
         }
 
-        return implode("\r\n", array_values($this->params)) . "\r\n";
+        return implode("\r\n", array_values($this->params))."\r\n";
     }
 
     /**
@@ -137,6 +137,6 @@ 
      */
     public function setParams($name, $value)
     {
-        $this->params[$name] = $name . ': ' . $value;
+        $this->params[$name] = $name.': '.$value;
     }
 }

mvc/models/Model.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct($container);
 
         if (!static::$tableName) {
-            throw new Exception('Table name not set in `' . __CLASS__ . '`` model.');
+            throw new Exception('Table name not set in `'.__CLASS__.'`` model.');
         }
 
         $this->_isNewRecord = $new;
@@ -110,7 +110,7 @@ 
     public static function finder(IQuery $query = null, $single = false, IContainer $container = null)
     {
         $query = ($query instanceof Query) ? $query : new Query($container->db);
-        $query->table = static::$tableName . ' `m`';
+        $query->table = static::$tableName.' `m`';
         $query->objectName = get_called_class();
         $query->single = $single;
 
@@ -378,7 +378,7 @@ 
                     $where .= '`'.self::$primaryKey.'` = :'.self::$primaryKey;
                 } else {
                     throw new Exception($this->container,
-                        'In table ' . static::$tableName . ' option `id` not defined/not use.'
+                        'In table '.static::$tableName.' option `id` not defined/not use.'
                     );
                 }
             }
@@ -422,7 +422,7 @@ 
         }
         if ($this->beforeDelete()) {
             if (!self::$primaryKey) {
-                throw new Exception('In table ' . static::$tableName . ' option `id` not defined/not use.');
+                throw new Exception('In table '.static::$tableName.' option `id` not defined/not use.');
             }
 
             if (