@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | protected $router = null; |
17 | 17 | |
18 | 18 | /** |
19 | - * @param bool|Request $request |
|
19 | + * @param null|Request $request |
|
20 | 20 | * @return array |
21 | 21 | */ |
22 | 22 | public function route($request = false) |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
43 | - * @param bool|Router $router |
|
43 | + * @param Router $router |
|
44 | 44 | * @return $this |
45 | 45 | */ |
46 | 46 | public function setRouter($router = false) |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | /** |
97 | 97 | * Public method to return the session id |
98 | 98 | * @todo implement a verification method ( ex: adding another validation string in the sessionID ) |
99 | - * @return int |
|
99 | + * @return string |
|
100 | 100 | */ |
101 | 101 | public function getId() |
102 | 102 | { |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * Fetches session entry from database |
108 | 108 | * |
109 | 109 | * @param string $id |
110 | - * @return mixed |
|
110 | + * @return string|false |
|
111 | 111 | */ |
112 | 112 | public function read($id) |
113 | 113 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * Decodes data to be used |
133 | 133 | * |
134 | 134 | * @param string $data |
135 | - * @return mixed |
|
135 | + * @return string |
|
136 | 136 | */ |
137 | 137 | protected function decodeData($data) |
138 | 138 | { |
@@ -230,11 +230,11 @@ |
||
230 | 230 | public function setRootDomain($domain) |
231 | 231 | { |
232 | 232 | if ($domain !== 'localhost') { |
233 | - ini_set('session.cookie_domain', '.'.$domain); |
|
233 | + ini_set('session.cookie_domain', '.' . $domain); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | Cookie\Jar::instance()->setDefaults( |
237 | - array('domain' => '.'.$domain) |
|
237 | + array('domain' => '.' . $domain) |
|
238 | 238 | ); |
239 | 239 | } |
240 | 240 |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
108 | - * @param $file |
|
108 | + * @param string $file |
|
109 | 109 | * @return bool |
110 | 110 | */ |
111 | 111 | protected function hasConfigFile($file) |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
145 | - * @return array |
|
145 | + * @return Stage[] |
|
146 | 146 | */ |
147 | 147 | public function getStages() |
148 | 148 | { |
@@ -118,6 +118,9 @@ discard block |
||
118 | 118 | |
119 | 119 | } |
120 | 120 | |
121 | + /** |
|
122 | + * @return double |
|
123 | + */ |
|
121 | 124 | public function getSeconds() |
122 | 125 | { |
123 | 126 | if ($this->_seconds === null) { |
@@ -165,11 +168,17 @@ discard block |
||
165 | 168 | return $return; |
166 | 169 | } |
167 | 170 | |
171 | + /** |
|
172 | + * @return string |
|
173 | + */ |
|
168 | 174 | public function getHoursPart() |
169 | 175 | { |
170 | 176 | return $this->getPart('h'); |
171 | 177 | } |
172 | 178 | |
179 | + /** |
|
180 | + * @param string $p |
|
181 | + */ |
|
173 | 182 | public function getPart($p) |
174 | 183 | { |
175 | 184 | if ($this->_parts === null) { |
@@ -179,11 +188,17 @@ discard block |
||
179 | 188 | return $this->_parts[$p]; |
180 | 189 | } |
181 | 190 | |
191 | + /** |
|
192 | + * @return string |
|
193 | + */ |
|
182 | 194 | public function getMinutesPart() |
183 | 195 | { |
184 | 196 | return $this->getPart('m'); |
185 | 197 | } |
186 | 198 | |
199 | + /** |
|
200 | + * @return string |
|
201 | + */ |
|
187 | 202 | public function getSecondsPart() |
188 | 203 | { |
189 | 204 | return $this->getPart('s'); |
@@ -149,17 +149,17 @@ discard block |
||
149 | 149 | |
150 | 150 | $hours = $this->getHoursPart(); |
151 | 151 | if ($hours OR $return) { |
152 | - $return .= ($return ? ' ' : '').str_pad($hours, 2, 0, STR_PAD_LEFT).'h'; |
|
152 | + $return .= ($return ? ' ' : '') . str_pad($hours, 2, 0, STR_PAD_LEFT) . 'h'; |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | $minutes = $this->getMinutesPart(); |
156 | 156 | if ($minutes OR $return) { |
157 | - $return .= ($return ? ' ' : '').str_pad($minutes, 2, 0, STR_PAD_LEFT).'m'; |
|
157 | + $return .= ($return ? ' ' : '') . str_pad($minutes, 2, 0, STR_PAD_LEFT) . 'm'; |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | $seconds = $this->getSecondsPart(); |
161 | 161 | if ($seconds) { |
162 | - $return .= ($return ? ' ' : '').str_pad($seconds, 2, 0, STR_PAD_LEFT).'s'; |
|
162 | + $return .= ($return ? ' ' : '') . str_pad($seconds, 2, 0, STR_PAD_LEFT) . 's'; |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | return $return; |
@@ -195,6 +195,6 @@ discard block |
||
195 | 195 | $minutes = str_pad($this->getMinutesPart(), 2, 0, STR_PAD_LEFT); |
196 | 196 | $seconds = str_pad($this->getSecondsPart(), 2, 0, STR_PAD_LEFT); |
197 | 197 | |
198 | - return $hours.':'.$minutes.':'.$seconds; |
|
198 | + return $hours . ':' . $minutes . ':' . $seconds; |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | \ No newline at end of file |
@@ -236,7 +236,7 @@ |
||
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
239 | - * @param $path |
|
239 | + * @param string $path |
|
240 | 240 | * @return $this |
241 | 241 | */ |
242 | 242 | public function setBasePath($path) |
@@ -143,6 +143,9 @@ |
||
143 | 143 | $this->_layout = $layout; |
144 | 144 | } |
145 | 145 | |
146 | + /** |
|
147 | + * @param string|null $body |
|
148 | + */ |
|
146 | 149 | public function setBody($body) |
147 | 150 | { |
148 | 151 | $this->_mail->setBody($body); |
@@ -8,149 +8,149 @@ |
||
8 | 8 | class Email extends View |
9 | 9 | { |
10 | 10 | |
11 | - protected $_layout = "/layouts/email"; |
|
11 | + protected $_layout = "/layouts/email"; |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @var \Nip_Mailer|null |
15 | 15 | */ |
16 | 16 | protected $_mail = null; |
17 | 17 | |
18 | - public function __construct() |
|
19 | - { |
|
20 | - $this->initMailer(); |
|
21 | - } |
|
18 | + public function __construct() |
|
19 | + { |
|
20 | + $this->initMailer(); |
|
21 | + } |
|
22 | 22 | |
23 | 23 | public function initMailer() |
24 | 24 | { |
25 | 25 | $this->_mail = new \Nip_Mailer(); |
26 | 26 | } |
27 | 27 | |
28 | - public function initBasePath() |
|
29 | - { |
|
30 | - $this->setBasePath(MODULES_PATH . Request::instance()->getModuleName() . '/views/'); |
|
31 | - } |
|
32 | - |
|
33 | - /** |
|
34 | - * @param string $host |
|
35 | - * @param string $username |
|
36 | - * @param string $password |
|
37 | - * @return $this |
|
38 | - */ |
|
39 | - public function authSMTP($host, $username, $password) |
|
40 | - { |
|
41 | - $this->_mail->authSMTP($host, $username, $password); |
|
42 | - return $this; |
|
43 | - } |
|
44 | - |
|
45 | - /** |
|
46 | - * Sets flag to show SMTP debugging information |
|
47 | - * @return $this |
|
48 | - */ |
|
49 | - public function debugSMTP() |
|
50 | - { |
|
51 | - $this->_mail->debugSMTP(); |
|
52 | - return $this; |
|
53 | - } |
|
54 | - |
|
55 | - /** |
|
56 | - * @param string $address |
|
57 | - * @param string|bool $name |
|
58 | - * @return $this |
|
59 | - */ |
|
60 | - public function setFrom($address, $name = false) |
|
61 | - { |
|
62 | - $this->_mail->setFrom($address, $name); |
|
63 | - return $this; |
|
64 | - } |
|
65 | - |
|
66 | - /** |
|
67 | - * @param string $address |
|
68 | - * @param string|bool $name |
|
69 | - * @return $this |
|
70 | - */ |
|
71 | - public function addTo($address, $name = false) |
|
72 | - { |
|
73 | - $this->_mail->addTo($address, $name); |
|
74 | - return $this; |
|
75 | - } |
|
76 | - |
|
77 | - /** |
|
78 | - * @param string $address |
|
79 | - * @param string $name |
|
80 | - * @return $this |
|
81 | - */ |
|
82 | - public function addBCC($address, $name = '') |
|
83 | - { |
|
84 | - $this->_mail->addBCC($address, $name); |
|
85 | - return $this; |
|
86 | - } |
|
87 | - |
|
88 | - /** |
|
89 | - * @param string $address |
|
90 | - * @param string|bool $name |
|
91 | - * @return $this |
|
92 | - */ |
|
93 | - public function addReplyTo($address, $name = false) |
|
94 | - { |
|
95 | - $this->_mail->addReplyTo($address, $name); |
|
96 | - return $this; |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * @return $this |
|
101 | - */ |
|
102 | - public function clearAllRecipients() |
|
103 | - { |
|
104 | - $this->_mail->clearAllRecipients(); |
|
105 | - return $this; |
|
106 | - } |
|
107 | - |
|
108 | - /** |
|
109 | - * @param string $subject |
|
110 | - * @return $this |
|
111 | - */ |
|
112 | - public function setSubject($subject) |
|
113 | - { |
|
114 | - $this->_mail->setSubject($subject); |
|
115 | - return $this; |
|
116 | - } |
|
117 | - |
|
118 | - /** |
|
119 | - * Adds attachment |
|
120 | - * |
|
121 | - * @param string $path |
|
122 | - * @param string $name |
|
123 | - * @return $this |
|
124 | - */ |
|
125 | - public function addAttachment($path, $name = '') |
|
126 | - { |
|
127 | - $this->_mail->addAttachment($path, $name); |
|
128 | - return $this; |
|
129 | - } |
|
130 | - |
|
131 | - public function send() |
|
132 | - { |
|
133 | - if (!$this->getBody()) { |
|
134 | - $this->setBody($this->load($this->_layout, array(), true)); |
|
135 | - } |
|
136 | - $this->_mail->setAltBody($this->getBody()); |
|
137 | - |
|
138 | - return $this->_mail->send(); |
|
139 | - } |
|
140 | - |
|
141 | - public function setLayout($layout) |
|
142 | - { |
|
143 | - $this->_layout = $layout; |
|
144 | - } |
|
145 | - |
|
146 | - public function setBody($body) |
|
147 | - { |
|
148 | - $this->_mail->setBody($body); |
|
149 | - return $this; |
|
150 | - } |
|
151 | - |
|
152 | - public function getBody() |
|
153 | - { |
|
154 | - return $this->_mail->getBody(); |
|
155 | - } |
|
28 | + public function initBasePath() |
|
29 | + { |
|
30 | + $this->setBasePath(MODULES_PATH . Request::instance()->getModuleName() . '/views/'); |
|
31 | + } |
|
32 | + |
|
33 | + /** |
|
34 | + * @param string $host |
|
35 | + * @param string $username |
|
36 | + * @param string $password |
|
37 | + * @return $this |
|
38 | + */ |
|
39 | + public function authSMTP($host, $username, $password) |
|
40 | + { |
|
41 | + $this->_mail->authSMTP($host, $username, $password); |
|
42 | + return $this; |
|
43 | + } |
|
44 | + |
|
45 | + /** |
|
46 | + * Sets flag to show SMTP debugging information |
|
47 | + * @return $this |
|
48 | + */ |
|
49 | + public function debugSMTP() |
|
50 | + { |
|
51 | + $this->_mail->debugSMTP(); |
|
52 | + return $this; |
|
53 | + } |
|
54 | + |
|
55 | + /** |
|
56 | + * @param string $address |
|
57 | + * @param string|bool $name |
|
58 | + * @return $this |
|
59 | + */ |
|
60 | + public function setFrom($address, $name = false) |
|
61 | + { |
|
62 | + $this->_mail->setFrom($address, $name); |
|
63 | + return $this; |
|
64 | + } |
|
65 | + |
|
66 | + /** |
|
67 | + * @param string $address |
|
68 | + * @param string|bool $name |
|
69 | + * @return $this |
|
70 | + */ |
|
71 | + public function addTo($address, $name = false) |
|
72 | + { |
|
73 | + $this->_mail->addTo($address, $name); |
|
74 | + return $this; |
|
75 | + } |
|
76 | + |
|
77 | + /** |
|
78 | + * @param string $address |
|
79 | + * @param string $name |
|
80 | + * @return $this |
|
81 | + */ |
|
82 | + public function addBCC($address, $name = '') |
|
83 | + { |
|
84 | + $this->_mail->addBCC($address, $name); |
|
85 | + return $this; |
|
86 | + } |
|
87 | + |
|
88 | + /** |
|
89 | + * @param string $address |
|
90 | + * @param string|bool $name |
|
91 | + * @return $this |
|
92 | + */ |
|
93 | + public function addReplyTo($address, $name = false) |
|
94 | + { |
|
95 | + $this->_mail->addReplyTo($address, $name); |
|
96 | + return $this; |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * @return $this |
|
101 | + */ |
|
102 | + public function clearAllRecipients() |
|
103 | + { |
|
104 | + $this->_mail->clearAllRecipients(); |
|
105 | + return $this; |
|
106 | + } |
|
107 | + |
|
108 | + /** |
|
109 | + * @param string $subject |
|
110 | + * @return $this |
|
111 | + */ |
|
112 | + public function setSubject($subject) |
|
113 | + { |
|
114 | + $this->_mail->setSubject($subject); |
|
115 | + return $this; |
|
116 | + } |
|
117 | + |
|
118 | + /** |
|
119 | + * Adds attachment |
|
120 | + * |
|
121 | + * @param string $path |
|
122 | + * @param string $name |
|
123 | + * @return $this |
|
124 | + */ |
|
125 | + public function addAttachment($path, $name = '') |
|
126 | + { |
|
127 | + $this->_mail->addAttachment($path, $name); |
|
128 | + return $this; |
|
129 | + } |
|
130 | + |
|
131 | + public function send() |
|
132 | + { |
|
133 | + if (!$this->getBody()) { |
|
134 | + $this->setBody($this->load($this->_layout, array(), true)); |
|
135 | + } |
|
136 | + $this->_mail->setAltBody($this->getBody()); |
|
137 | + |
|
138 | + return $this->_mail->send(); |
|
139 | + } |
|
140 | + |
|
141 | + public function setLayout($layout) |
|
142 | + { |
|
143 | + $this->_layout = $layout; |
|
144 | + } |
|
145 | + |
|
146 | + public function setBody($body) |
|
147 | + { |
|
148 | + $this->_mail->setBody($body); |
|
149 | + return $this; |
|
150 | + } |
|
151 | + |
|
152 | + public function getBody() |
|
153 | + { |
|
154 | + return $this->_mail->getBody(); |
|
155 | + } |
|
156 | 156 | } |
157 | 157 | \ No newline at end of file |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $map = '/', |
46 | 46 | $params = [] |
47 | 47 | ) { |
48 | - $map = $mapPrefix.$map; |
|
48 | + $map = $mapPrefix . $map; |
|
49 | 49 | |
50 | 50 | return self::generateGenericRoute($collection, $name, $class, $map, $params); |
51 | 51 | } |
@@ -88,6 +88,6 @@ discard block |
||
88 | 88 | $map = '/:controller/:action', |
89 | 89 | $params = [] |
90 | 90 | ) { |
91 | - return self::generateGenericRoute($collection, $name, $class, $mapPrefix.$map, $params); |
|
91 | + return self::generateGenericRoute($collection, $name, $class, $mapPrefix . $map, $params); |
|
92 | 92 | } |
93 | 93 | } |
@@ -30,6 +30,6 @@ |
||
30 | 30 | { |
31 | 31 | $params = $this->stripEmptyParams($params); |
32 | 32 | |
33 | - return $this->getMap().($params ? '?'.http_build_query($params) : ''); |
|
33 | + return $this->getMap() . ($params ? '?' . http_build_query($params) : ''); |
|
34 | 34 | } |
35 | 35 | } |
@@ -127,7 +127,7 @@ |
||
127 | 127 | { |
128 | 128 | $return = ''; |
129 | 129 | foreach ($this->attributes as $name => $value) { |
130 | - $return .= ' '.$name.'="'.$value.'"'; |
|
130 | + $return .= ' ' . $name . '="' . $value . '"'; |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | return $return; |