Completed
Pull Request — master (#3)
by Chris
03:26
created
php/hamle/Text/Filter.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
       throw new ParseError("Unable to parse filter expression \"$s\"");
68 68
     }
69 69
     if (method_exists(Filter::class, $this->filter)) {
70
-      $this->filter = Filter::class . '::' . $this->filter;
70
+      $this->filter = Filter::class.'::'.$this->filter;
71 71
     } elseif (
72 72
       in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])
73 73
     ) {
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
   function toHTML($escape = false)
88 88
   {
89 89
     if ($escape) {
90
-      return '<?=htmlspecialchars(' . $this->toPHP() . ')?>';
90
+      return '<?=htmlspecialchars('.$this->toPHP().')?>';
91 91
     }
92
-    return '<?=' . $this->toPHP() . '?>';
92
+    return '<?='.$this->toPHP().'?>';
93 93
   }
94 94
 
95 95
   function toPHPpre()
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
     }
110 110
     $o = '';
111 111
     foreach ($this->vars as $v) {
112
-      $o .= ',' . $this->varToCode($v);
112
+      $o .= ','.$this->varToCode($v);
113 113
     }
114 114
     return "$o)$post";
115 115
   }
116 116
 
117 117
   function toPHP()
118 118
   {
119
-    return $this->toPHPpre() . $this->what->toPHPVar() . $this->toPHPpost();
119
+    return $this->toPHPpre().$this->what->toPHPVar().$this->toPHPpost();
120 120
     // $o = [$this->what->toPHPVar()] ;
121 121
     // foreach($this->vars as $v)
122 122
     //   $o[] = $this->varToCode($v);
Please login to merge, or discard this patch.
php/hamle/Text/FuncSub.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
   {
43 43
     $m = [];
44 44
     if (
45
-      !preg_match('/^ +([><]) +(' . self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m)
45
+      !preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL.'+)(.*)$/', $s, $m)
46 46
     ) {
47 47
       throw new ParseError("Unable to read \$ sub func in '$s'");
48 48
     }
@@ -71,18 +71,18 @@  discard block
 block discarded – undo
71 71
   public function toPHP()
72 72
   {
73 73
     $limit =
74
-      Hamle\Text::varToCode($this->sortlimit['sort']) .
75
-      ',' .
76
-      $this->sortlimit['limit'] .
77
-      ',' .
78
-      $this->sortlimit['offset'] .
79
-      ',' .
74
+      Hamle\Text::varToCode($this->sortlimit['sort']).
75
+      ','.
76
+      $this->sortlimit['limit'].
77
+      ','.
78
+      $this->sortlimit['offset'].
79
+      ','.
80 80
       $this->grouptype['grouptype'];
81
-    $sub = $this->sub ? '->' . $this->sub->toPHP() : '';
82
-    return 'hamleRel(' .
83
-      $this->dir .
84
-      ',' .
85
-      Hamle\Text::varToCode($this->filt['tag']) .
81
+    $sub = $this->sub ? '->'.$this->sub->toPHP() : '';
82
+    return 'hamleRel('.
83
+      $this->dir.
84
+      ','.
85
+      Hamle\Text::varToCode($this->filt['tag']).
86 86
       ",$limit)$sub";
87 87
   }
88 88
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
     if (!$model->valid()) {
99 99
       if (!$parent instanceof Hamle\WriteModel) {
100 100
         throw new \Exception(
101
-          'Cant create model, ' .
102
-            get_class($parent) .
101
+          'Cant create model, '.
102
+            get_class($parent).
103 103
             ' must implement Hamle\\WriteModel.',
104 104
         );
105 105
       }
Please login to merge, or discard this patch.
php/hamle/Text/FormField.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,11 +38,11 @@
 block discarded – undo
38 38
 
39 39
   function toPHP()
40 40
   {
41
-    return '$form->getField(' . Text::varToCode($this->var) . ')->getValue()';
41
+    return '$form->getField('.Text::varToCode($this->var).')->getValue()';
42 42
   }
43 43
 
44 44
   function toHTML($escape = false)
45 45
   {
46
-    return '<?=' . $this->toPHP() . '?>';
46
+    return '<?='.$this->toPHP().'?>';
47 47
   }
48 48
 }
Please login to merge, or discard this patch.
php/hamle/Filter/Sass.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     }
51 51
     $s = implode("\n", $as);
52 52
 
53
-    require_once ME_DIR . '/lib/phpsass/SassParser.php';
53
+    require_once ME_DIR.'/lib/phpsass/SassParser.php';
54 54
     $sp = new SassParser([
55 55
       'cache' => false,
56 56
       'style' => stdConf::get('me.developer')
@@ -62,6 +62,6 @@  discard block
 block discarded – undo
62 62
     $tree = $sp->toTree($s);
63 63
     $out = $tree->render();
64 64
     $pad = str_pad('', $indent, ' ');
65
-    return $pad . str_replace("\n", "\n$pad", trim($out));
65
+    return $pad.str_replace("\n", "\n$pad", trim($out));
66 66
   }
67 67
 }
Please login to merge, or discard this patch.
php/hamle/Filter/Javascript.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@
 block discarded – undo
43 43
 
44 44
   static function filterText($s)
45 45
   {
46
-    return "/*<![CDATA[*/\n" .
46
+    return "/*<![CDATA[*/\n".
47 47
       /*preg_replace(HamlParser::MATCH_INTERPOLATION, '<?php echo \1; ?>', $text)*/
48
-      $s .
48
+      $s.
49 49
       '/*]]>*/';
50 50
   }
51 51
 }
Please login to merge, or discard this patch.
php/hamle/Form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
   function setup()
48 48
   {
49 49
     throw new Exception\RunTime(
50
-      'You must configure the form in the setup ' .
50
+      'You must configure the form in the setup '.
51 51
         "function, by adding fields to the \$this->fields array",
52 52
     );
53 53
   }
Please login to merge, or discard this patch.
php/hamle/Scope.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
   {
26 26
     if (!$model instanceof Model) {
27 27
       throw new Unsupported(
28
-        'Unsupported Model (' .
29
-          get_class($model) .
28
+        'Unsupported Model ('.
29
+          get_class($model).
30 30
           '), Needs to implement hamleModel Interface',
31 31
       );
32 32
     }
Please login to merge, or discard this patch.
php/hamle/Field.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -132,15 +132,15 @@  discard block
 block discarded – undo
132 132
     if (!is_null($this->setValue)) {
133 133
       return $this->setValue;
134 134
     }
135
-    if (isset($_REQUEST[$this->form . '_' . $this->name])) {
136
-      return $_REQUEST[$this->form . '_' . $this->name];
135
+    if (isset($_REQUEST[$this->form.'_'.$this->name])) {
136
+      return $_REQUEST[$this->form.'_'.$this->name];
137 137
     }
138 138
     return $this->opt['default'];
139 139
   }
140 140
 
141 141
   function getInputAttStatic(&$atts, &$type, &$content)
142 142
   {
143
-    $atts['id'] = $atts['name'] = $this->form . '_' . $this->name;
143
+    $atts['id'] = $atts['name'] = $this->form.'_'.$this->name;
144 144
     $atts['type'] = 'text';
145 145
     $atts['class'][] = str_replace(
146 146
       ['Seufert\\', '\\'],
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
       ['', '_'],
175 175
       get_class($this),
176 176
     );
177
-    $atts['for'] = $this->form . '_' . $this->name;
177
+    $atts['for'] = $this->form.'_'.$this->name;
178 178
     $content = [$this->opt['label']];
179 179
   }
180 180
 
Please login to merge, or discard this patch.
php/hamle/Exception/ParseError.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
   function __construct($message = '', $code = 0, $previous = null)
34 34
   {
35 35
     ///@todo  Include Line number & file name within parse error exceptions
36
-    $message .= ', on line ' . Hamle\Hamle::getLineNo() . ' in file ?.hamle';
36
+    $message .= ', on line '.Hamle\Hamle::getLineNo().' in file ?.hamle';
37 37
     parent::__construct($message, $code, $previous);
38 38
   }
39 39
 }
Please login to merge, or discard this patch.