| | @@ -88,11 +88,11 @@ |
| 88 | 88 | $value_list = $this->GetSource($src); |
| 89 | 89 | foreach ($spec_list as $spec) { |
| 90 | 90 | $value = ArrayFilter::Get($value_list, $spec); |
| 91 | | - if (empty($filter)) { |
| 91 | + if (true === empty($filter)) { |
| 92 | 92 | $this->$spec = $value; |
| 93 | | - } elseif (method_exists($this, $filter)) { |
| 93 | + } elseif (true === method_exists($this, $filter)) { |
| 94 | 94 | $this->$spec = $this->$filter($value); |
| 95 | | - } elseif (method_exists('Text', $filter)) { |
| 95 | + } elseif (true === method_exists('Text', $filter)) { |
| 96 | 96 | $this->$spec = Text::$filter($value); |
| 97 | 97 | } else { |
| 98 | 98 | $this->$spec = $filter($value); |
| | @@ -100,56 +100,46 @@ |
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | | - public function ParseGet($stack) { |
| 104 | | - $stack = func_get_args(); |
| 103 | + public function ParseGet(...$stack) { |
| 105 | 104 | $filter = array_shift($stack); |
| 106 | 105 | $this->Parse('get', $filter, $stack); |
| 107 | 106 | } |
| 108 | 107 | |
| 109 | | - public function ParsePost($stack) { |
| 110 | | - $stack = func_get_args(); |
| 108 | + public function ParsePost(...$stack) { |
| 111 | 109 | $filter = array_shift($stack); |
| 112 | 110 | $this->Parse('post', $filter, $stack); |
| 113 | 111 | } |
| 114 | 112 | |
| 115 | | - public function ParseRequest($stack) { |
| 116 | | - $stack = func_get_args(); |
| 113 | + public function ParseRequest(...$stack) { |
| 117 | 114 | $filter = array_shift($stack); |
| 118 | 115 | $this->Parse('request', $filter, $stack); |
| 119 | 116 | } |
| 120 | 117 | |
| 121 | | - public function ParseGetInt($stack) { |
| 122 | | - $stack = func_get_args(); |
| 118 | + public function ParseGetInt(...$stack) { |
| 123 | 119 | $this->Parse('get', 'intval', $stack); |
| 124 | 120 | } |
| 125 | 121 | |
| 126 | | - public function ParsePostInt($stack) { |
| 127 | | - $stack = func_get_args(); |
| 122 | + public function ParsePostInt(...$stack) { |
| 128 | 123 | $this->Parse('post', 'intval', $stack); |
| 129 | 124 | } |
| 130 | 125 | |
| 131 | | - public function ParseGetOn($stack) { |
| 132 | | - $stack = func_get_args(); |
| 126 | + public function ParseGetOn(...$stack) { |
| 133 | 127 | $this->Parse('get', 'IsOn', $stack); |
| 134 | 128 | } |
| 135 | 129 | |
| 136 | | - public function ParsePostOn($stack) { |
| 137 | | - $stack = func_get_args(); |
| 130 | + public function ParsePostOn(...$stack) { |
| 138 | 131 | $this->Parse('post', 'IsOn', $stack); |
| 139 | 132 | } |
| 140 | 133 | |
| 141 | | - public function ParsePostStr($stack) { |
| 142 | | - $stack = func_get_args(); |
| 134 | + public function ParsePostStr(...$stack) { |
| 143 | 135 | $this->Parse('post', 'Escape', $stack); |
| 144 | 136 | } |
| 145 | 137 | |
| 146 | | - public function ParseGetData($stack) { |
| 147 | | - $stack = func_get_args(); |
| 138 | + public function ParseGetData(...$stack) { |
| 148 | 139 | $this->Parse('get', null, $stack); |
| 149 | 140 | } |
| 150 | 141 | |
| 151 | | - public function ParsePostData($stack) { |
| 152 | | - $stack = func_get_args(); |
| 142 | + public function ParsePostData(...$stack) { |
| 153 | 143 | $this->Parse('post', null, $stack); |
| 154 | 144 | } |
| 155 | 145 | |
trunk/include/request/request_class.php