@@ -125,7 +125,7 @@ |
||
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
128 | - * @return number $itemsPerPage |
|
128 | + * @return integer $itemsPerPage |
|
129 | 129 | */ |
130 | 130 | public function getItemsPerPage() |
131 | 131 | { |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | /** |
32 | 32 | * Get the current controller instance |
33 | 33 | * |
34 | - * @return null|Dispatchable |
|
34 | + * @return Dispatchable |
|
35 | 35 | */ |
36 | 36 | public function getController() |
37 | 37 | { |
@@ -45,6 +45,9 @@ discard block |
||
45 | 45 | return $this; |
46 | 46 | } |
47 | 47 | |
48 | + /** |
|
49 | + * @param AddressList $header |
|
50 | + */ |
|
48 | 51 | protected function stringFromMailHeader($header) |
49 | 52 | { |
50 | 53 | $erg = ''; |
@@ -133,6 +136,9 @@ discard block |
||
133 | 136 | } |
134 | 137 | } |
135 | 138 | |
139 | + /** |
|
140 | + * @return string |
|
141 | + */ |
|
136 | 142 | protected function getTemplate() |
137 | 143 | { |
138 | 144 | $template = null; |
@@ -69,18 +69,18 @@ discard block |
||
69 | 69 | $replyTo = $this->stringFromMailHeader($this->getReplyTo()); |
70 | 70 | |
71 | 71 | return str_pad($template, 30) |
72 | - . 'to: ' . str_pad($to, 50) |
|
73 | - . 'cc: ' . str_pad($cc, 50) |
|
74 | - . 'bcc: ' . str_pad($bcc, 50) |
|
75 | - . 'from: ' . str_pad($from, 50) |
|
76 | - . 'replyTo: ' . str_pad($replyTo, 50) |
|
72 | + . 'to: '.str_pad($to, 50) |
|
73 | + . 'cc: '.str_pad($cc, 50) |
|
74 | + . 'bcc: '.str_pad($bcc, 50) |
|
75 | + . 'from: '.str_pad($from, 50) |
|
76 | + . 'replyTo: '.str_pad($replyTo, 50) |
|
77 | 77 | //. str_pad(implode(',', ArrayUtils::iteratorToArray($this->getSender())),50) |
78 | - . 'subject: ' . str_pad($this->getSubject(), 50); |
|
78 | + . 'subject: '.str_pad($this->getSubject(), 50); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | public function template($template) |
82 | 82 | { |
83 | - $controller = get_class($this->controller); |
|
83 | + $controller = get_class($this->controller); |
|
84 | 84 | $services = $this->getController()->getServiceLocator(); |
85 | 85 | |
86 | 86 | $event = new Event(); |
@@ -97,11 +97,11 @@ discard block |
||
97 | 97 | $controllerIdentifier = strtolower(substr($controller, 0, strpos($controller, '\\'))); |
98 | 98 | $viewResolver = $this->getController()->getServiceLocator()->get('ViewResolver'); |
99 | 99 | |
100 | - $templateHalf = 'mail/' . $template; |
|
100 | + $templateHalf = 'mail/'.$template; |
|
101 | 101 | $resource = $viewResolver->resolve($templateHalf); |
102 | 102 | |
103 | 103 | if (empty($resource)) { |
104 | - $templateFull = $controllerIdentifier . '/mail/' . $template; |
|
104 | + $templateFull = $controllerIdentifier.'/mail/'.$template; |
|
105 | 105 | $resource = $viewResolver->resolve($templateFull); |
106 | 106 | } |
107 | 107 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | unset($__vars[$key]); |
129 | 129 | } |
130 | 130 | } |
131 | - unset($__vars['content'],$__vars['controllerIdentifier'],$__vars['controller'],$__vars['resource'],$__vars['template'],$__vars['viewResolver']); |
|
131 | + unset($__vars['content'], $__vars['controllerIdentifier'], $__vars['controller'], $__vars['resource'], $__vars['template'], $__vars['viewResolver']); |
|
132 | 132 | $this->config = $__vars; |
133 | 133 | } |
134 | 134 | } |
@@ -153,20 +153,20 @@ discard block |
||
153 | 153 | if (isset($this->config['from'])) { |
154 | 154 | $from = $this->config['from']; |
155 | 155 | } else { |
156 | - $log->err('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
157 | - throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
156 | + $log->err('A from email address must be provided (Variable $from) in Template: '.$template); |
|
157 | + throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: '.$template); |
|
158 | 158 | } |
159 | 159 | if (isset($this->config['fromName'])) { |
160 | 160 | $fromName = $this->config['fromName']; |
161 | 161 | } else { |
162 | - $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
163 | - throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
162 | + $log->err('A from name must be provided (Variable $fromName) in Template: '.$template); |
|
163 | + throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: '.$template); |
|
164 | 164 | } |
165 | 165 | if (isset($this->config['subject'])) { |
166 | 166 | $subject = $this->config['subject']; |
167 | 167 | } else { |
168 | - $log->err('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
169 | - throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
168 | + $log->err('A subject must be provided (Variable $subject) in Template: '.$template); |
|
169 | + throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: '.$template); |
|
170 | 170 | } |
171 | 171 | $this->setFrom($from, $fromName); |
172 | 172 | $this->setSubject($subject); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | $erg = true; |
189 | 189 | $log->info($this); |
190 | 190 | } catch (Exception $e) { |
191 | - $log->err('Mail failure ' . $e->getMessage()); |
|
191 | + $log->err('Mail failure '.$e->getMessage()); |
|
192 | 192 | //$this->getController()->getServiceLocator()->get('Core/Log')->warn('Mail failure ' . $e->getMessage()); |
193 | 193 | } |
194 | 194 | //} |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | } elseif (isset($this->config['templateHalf'])) { |
169 | 169 | $template = $this->config['templateHalf']; |
170 | 170 | } else { |
171 | - throw new \InvalidArgumentException('Not template provided for Mail.'); |
|
171 | + throw new \InvalidArgumentException('Not template provided for Mail.'); |
|
172 | 172 | } |
173 | 173 | return $template; |
174 | 174 | } |
@@ -181,19 +181,19 @@ discard block |
||
181 | 181 | $from = $this->config['from']; |
182 | 182 | } else { |
183 | 183 | $log->err('A from email address must be provided (Variable $from) in Template: ' . $template); |
184 | - throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
184 | + throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
185 | 185 | } |
186 | 186 | if (isset($this->config['fromName'])) { |
187 | 187 | $fromName = $this->config['fromName']; |
188 | 188 | } else { |
189 | 189 | $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template); |
190 | - throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
190 | + throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
191 | 191 | } |
192 | 192 | if (isset($this->config['subject'])) { |
193 | 193 | $subject = $this->config['subject']; |
194 | 194 | } else { |
195 | 195 | $log->err('A subject must be provided (Variable $subject) in Template: ' . $template); |
196 | - throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
196 | + throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
197 | 197 | } |
198 | 198 | $this->setFrom($from, $fromName); |
199 | 199 | $this->setSubject($subject); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | * and the configuration to get the services for Hydrator |
24 | 24 | * |
25 | 25 | * @param ServiceLocatorInterface $serviceLocator |
26 | - * @return $this|mixed |
|
26 | + * @return EntitySnapshot |
|
27 | 27 | */ |
28 | 28 | |
29 | 29 | public function createService(ServiceLocatorInterface $serviceLocator) |
@@ -55,7 +55,6 @@ |
||
55 | 55 | * Two-letter codes from the ISO 3166 standard as implemented by The Internet Assigned |
56 | 56 | * Numbers Authority. |
57 | 57 | * |
58 | - * @param string $postalCode {'AC'|'AD'|'AE'|'AF'|'AG'|'AI'|'AL'|'AM'|'AN'|'AO'|'AQ'|'AR'|'AS'|'AT'|'AU'|'AW'|'AX'|'AZ'|'BA'|'BB'|'BD'|'BE'|'BF'|'BG'|'BH'|'BI'|'BJ'|'BL'|'BM'|'BN'|'BO'|'BR'|'BS'|'BT'|'BV'|'BW'|'BY'|'BZ'|'CA'|'CC'|'CD'|'CF'|'CG'|'CH'|'CI'|'CK'|'CL'|'CM'|'CN'|'CO'|'CR'|'CU'|'CV'|'CX'|'CY'|'CZ'|'DE'|'DJ'|'DK'|'DM'|'DO'|'DZ'|'EC'|'EE'|'EG'|'EH'|'ER'|'ES'|'ET'|'EU'|'FI'|'FJ'|'FK'|'FM'|'FO'|'FR'|'GA'|'GB'|'GD'|'GE'|'GF'|'GG'|'GH'|'GI'|'GL'|'GM'|'GN'|'GP'|'GQ'|'GR'|'GS'|'GT'|'GU'|'GW'|'GY'|'HK'|'HM'|'HN'|'HR'|'HT'|'HU'|'ID'|'IE'|'IL'|'IM'|'IN'|'IO'|'IQ'|'IR'|'IS'|'IT'|'JE'|'JM'|'JO'|'JP'|'KE'|'KG'|'KH'|'KI'|'KM'|'KN'|'KP'|'KR'|'KW'|'KY'|'KZ'|'LA'|'LB'|'LC'|'LI'|'LK'|'LR'|'LS'|'LT'|'LU'|'LV'|'LY'|'MA'|'MC'|'MD'|'ME'|'MF'|'MG'|'MH'|'MK'|'ML'|'MM'|'MN'|'MO'|'MP'|'MQ'|'MR'|'MS'|'MT'|'MU'|'MV'|'MW'|'MX'|'MY'|'MZ'|'NA'|'NC'|'NE'|'NF'|'NG'|'NI'|'NL'|'NO'|'NP'|'NR'|'NU'|'NZ'|'OM'|'PA'|'PE'|'PF'|'PG'|'PH'|'PK'|'PL'|'PM'|'PN'|'PR'|'PS'|'PT'|'PW'|'PY'|'QA'|'RE'|'RO'|'RS'|'RU'|'RW'|'SA'|'SB'|'SC'|'SD'|'SE'|'SG'|'SH'|'SI'|'SJ'|'SK'|'SL'|'SM'|'SN'|'SO'|'SR'|'ST'|'SU'|'SV'|'SY'|'SZ'|'TC'|'TD'|'TF'|'TG'|'TH'|'TJ'|'TK'|'TL'|'TM'|'TN'|'TO'|'TP'|'TR'|'TT'|'TV'|'TW'|'TZ'|'UA'|'UG'|'UK'|'UM'|'US'|'UY'|'UZ'|'VA'|'VC'|'VE'|'VG'|'VI'|'VN'|'VU'|'WF'|'WS'|'YE'|'YT'|'YU'|'ZA'|'ZM'|'ZW'} |
|
59 | 58 | * @return AddressInterface |
60 | 59 | */ |
61 | 60 | public function setCountryCode($countryCode); |
@@ -14,50 +14,50 @@ |
||
14 | 14 | interface AddressInterface extends EntityInterface |
15 | 15 | { |
16 | 16 | |
17 | - /** |
|
18 | - * Postal Code of the Address. |
|
19 | - * |
|
20 | - * @param string $postalCode |
|
21 | - * @return AddressInterface |
|
22 | - */ |
|
17 | + /** |
|
18 | + * Postal Code of the Address. |
|
19 | + * |
|
20 | + * @param string $postalCode |
|
21 | + * @return AddressInterface |
|
22 | + */ |
|
23 | 23 | public function setPostalCode($postalCode); |
24 | 24 | public function getPostalCode(); |
25 | 25 | |
26 | - /** |
|
27 | - * Identifies the town or the city |
|
28 | - * |
|
29 | - * @param string $cityName |
|
30 | - * @return AddressInterface |
|
31 | - */ |
|
26 | + /** |
|
27 | + * Identifies the town or the city |
|
28 | + * |
|
29 | + * @param string $cityName |
|
30 | + * @return AddressInterface |
|
31 | + */ |
|
32 | 32 | public function setCityName($cityName); |
33 | 33 | public function getCityName(); |
34 | 34 | |
35 | - /** |
|
36 | - * The Street Name where the building/ house is located |
|
37 | - * |
|
38 | - * @param string $streetName |
|
39 | - * @return AddressInterface |
|
40 | - */ |
|
35 | + /** |
|
36 | + * The Street Name where the building/ house is located |
|
37 | + * |
|
38 | + * @param string $streetName |
|
39 | + * @return AddressInterface |
|
40 | + */ |
|
41 | 41 | public function setStreetName($streetName); |
42 | 42 | public function getStreetName(); |
43 | 43 | |
44 | - /** |
|
45 | - * The Number of the building or house on the street that identifies where |
|
46 | - * to deliver mail. For example, Building 300 on Standards Parkway |
|
47 | - * |
|
48 | - * @param string $buildingNumber |
|
49 | - * @return AddressInterface |
|
50 | - */ |
|
44 | + /** |
|
45 | + * The Number of the building or house on the street that identifies where |
|
46 | + * to deliver mail. For example, Building 300 on Standards Parkway |
|
47 | + * |
|
48 | + * @param string $buildingNumber |
|
49 | + * @return AddressInterface |
|
50 | + */ |
|
51 | 51 | public function setBuildingNumber($buildingNumber); |
52 | 52 | public function getBuildingNumber(); |
53 | 53 | |
54 | - /** |
|
55 | - * Two-letter codes from the ISO 3166 standard as implemented by The Internet Assigned |
|
56 | - * Numbers Authority. |
|
57 | - * |
|
58 | - * @param string $postalCode {'AC'|'AD'|'AE'|'AF'|'AG'|'AI'|'AL'|'AM'|'AN'|'AO'|'AQ'|'AR'|'AS'|'AT'|'AU'|'AW'|'AX'|'AZ'|'BA'|'BB'|'BD'|'BE'|'BF'|'BG'|'BH'|'BI'|'BJ'|'BL'|'BM'|'BN'|'BO'|'BR'|'BS'|'BT'|'BV'|'BW'|'BY'|'BZ'|'CA'|'CC'|'CD'|'CF'|'CG'|'CH'|'CI'|'CK'|'CL'|'CM'|'CN'|'CO'|'CR'|'CU'|'CV'|'CX'|'CY'|'CZ'|'DE'|'DJ'|'DK'|'DM'|'DO'|'DZ'|'EC'|'EE'|'EG'|'EH'|'ER'|'ES'|'ET'|'EU'|'FI'|'FJ'|'FK'|'FM'|'FO'|'FR'|'GA'|'GB'|'GD'|'GE'|'GF'|'GG'|'GH'|'GI'|'GL'|'GM'|'GN'|'GP'|'GQ'|'GR'|'GS'|'GT'|'GU'|'GW'|'GY'|'HK'|'HM'|'HN'|'HR'|'HT'|'HU'|'ID'|'IE'|'IL'|'IM'|'IN'|'IO'|'IQ'|'IR'|'IS'|'IT'|'JE'|'JM'|'JO'|'JP'|'KE'|'KG'|'KH'|'KI'|'KM'|'KN'|'KP'|'KR'|'KW'|'KY'|'KZ'|'LA'|'LB'|'LC'|'LI'|'LK'|'LR'|'LS'|'LT'|'LU'|'LV'|'LY'|'MA'|'MC'|'MD'|'ME'|'MF'|'MG'|'MH'|'MK'|'ML'|'MM'|'MN'|'MO'|'MP'|'MQ'|'MR'|'MS'|'MT'|'MU'|'MV'|'MW'|'MX'|'MY'|'MZ'|'NA'|'NC'|'NE'|'NF'|'NG'|'NI'|'NL'|'NO'|'NP'|'NR'|'NU'|'NZ'|'OM'|'PA'|'PE'|'PF'|'PG'|'PH'|'PK'|'PL'|'PM'|'PN'|'PR'|'PS'|'PT'|'PW'|'PY'|'QA'|'RE'|'RO'|'RS'|'RU'|'RW'|'SA'|'SB'|'SC'|'SD'|'SE'|'SG'|'SH'|'SI'|'SJ'|'SK'|'SL'|'SM'|'SN'|'SO'|'SR'|'ST'|'SU'|'SV'|'SY'|'SZ'|'TC'|'TD'|'TF'|'TG'|'TH'|'TJ'|'TK'|'TL'|'TM'|'TN'|'TO'|'TP'|'TR'|'TT'|'TV'|'TW'|'TZ'|'UA'|'UG'|'UK'|'UM'|'US'|'UY'|'UZ'|'VA'|'VC'|'VE'|'VG'|'VI'|'VN'|'VU'|'WF'|'WS'|'YE'|'YT'|'YU'|'ZA'|'ZM'|'ZW'} |
|
59 | - * @return AddressInterface |
|
60 | - */ |
|
54 | + /** |
|
55 | + * Two-letter codes from the ISO 3166 standard as implemented by The Internet Assigned |
|
56 | + * Numbers Authority. |
|
57 | + * |
|
58 | + * @param string $postalCode {'AC'|'AD'|'AE'|'AF'|'AG'|'AI'|'AL'|'AM'|'AN'|'AO'|'AQ'|'AR'|'AS'|'AT'|'AU'|'AW'|'AX'|'AZ'|'BA'|'BB'|'BD'|'BE'|'BF'|'BG'|'BH'|'BI'|'BJ'|'BL'|'BM'|'BN'|'BO'|'BR'|'BS'|'BT'|'BV'|'BW'|'BY'|'BZ'|'CA'|'CC'|'CD'|'CF'|'CG'|'CH'|'CI'|'CK'|'CL'|'CM'|'CN'|'CO'|'CR'|'CU'|'CV'|'CX'|'CY'|'CZ'|'DE'|'DJ'|'DK'|'DM'|'DO'|'DZ'|'EC'|'EE'|'EG'|'EH'|'ER'|'ES'|'ET'|'EU'|'FI'|'FJ'|'FK'|'FM'|'FO'|'FR'|'GA'|'GB'|'GD'|'GE'|'GF'|'GG'|'GH'|'GI'|'GL'|'GM'|'GN'|'GP'|'GQ'|'GR'|'GS'|'GT'|'GU'|'GW'|'GY'|'HK'|'HM'|'HN'|'HR'|'HT'|'HU'|'ID'|'IE'|'IL'|'IM'|'IN'|'IO'|'IQ'|'IR'|'IS'|'IT'|'JE'|'JM'|'JO'|'JP'|'KE'|'KG'|'KH'|'KI'|'KM'|'KN'|'KP'|'KR'|'KW'|'KY'|'KZ'|'LA'|'LB'|'LC'|'LI'|'LK'|'LR'|'LS'|'LT'|'LU'|'LV'|'LY'|'MA'|'MC'|'MD'|'ME'|'MF'|'MG'|'MH'|'MK'|'ML'|'MM'|'MN'|'MO'|'MP'|'MQ'|'MR'|'MS'|'MT'|'MU'|'MV'|'MW'|'MX'|'MY'|'MZ'|'NA'|'NC'|'NE'|'NF'|'NG'|'NI'|'NL'|'NO'|'NP'|'NR'|'NU'|'NZ'|'OM'|'PA'|'PE'|'PF'|'PG'|'PH'|'PK'|'PL'|'PM'|'PN'|'PR'|'PS'|'PT'|'PW'|'PY'|'QA'|'RE'|'RO'|'RS'|'RU'|'RW'|'SA'|'SB'|'SC'|'SD'|'SE'|'SG'|'SH'|'SI'|'SJ'|'SK'|'SL'|'SM'|'SN'|'SO'|'SR'|'ST'|'SU'|'SV'|'SY'|'SZ'|'TC'|'TD'|'TF'|'TG'|'TH'|'TJ'|'TK'|'TL'|'TM'|'TN'|'TO'|'TP'|'TR'|'TT'|'TV'|'TW'|'TZ'|'UA'|'UG'|'UK'|'UM'|'US'|'UY'|'UZ'|'VA'|'VC'|'VE'|'VG'|'VI'|'VN'|'VU'|'WF'|'WS'|'YE'|'YT'|'YU'|'ZA'|'ZM'|'ZW'} |
|
59 | + * @return AddressInterface |
|
60 | + */ |
|
61 | 61 | public function setCountryCode($countryCode); |
62 | 62 | public function getCountryCode(); |
63 | 63 | } |
@@ -89,7 +89,7 @@ |
||
89 | 89 | |
90 | 90 | /** |
91 | 91 | * exclude methods from the automatism |
92 | - * @param $methods |
|
92 | + * @param string[] $methods |
|
93 | 93 | */ |
94 | 94 | public function setExcludeMethods($methods) |
95 | 95 | { |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | $getters = array_filter( |
34 | 34 | get_class_methods($object), |
35 | - function ($methodName) use ($object) { |
|
35 | + function($methodName) use ($object) { |
|
36 | 36 | return "get" === substr($methodName, 0, 3) |
37 | - && method_exists($object, 's' . substr($methodName, 1)); |
|
37 | + && method_exists($object, 's'.substr($methodName, 1)); |
|
38 | 38 | } |
39 | 39 | ); |
40 | 40 | |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | } |
62 | 62 | $setters = array_filter( |
63 | 63 | get_class_methods($object), |
64 | - function ($methodName) { |
|
64 | + function($methodName) { |
|
65 | 65 | return "set" === substr($methodName, 0, 3); |
66 | 66 | } |
67 | 67 | ); |
@@ -21,7 +21,7 @@ |
||
21 | 21 | * Create the Json Entity Hydrator |
22 | 22 | * |
23 | 23 | * @param ServiceLocatorInterface $serviceLocator |
24 | - * @return JsonEntityHydrator |
|
24 | + * @return EntityHydrator |
|
25 | 25 | */ |
26 | 26 | public function createService(ServiceLocatorInterface $serviceLocator) |
27 | 27 | { |
@@ -24,7 +24,7 @@ |
||
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @param $data |
27 | - * @return mixed |
|
27 | + * @return Snapshot |
|
28 | 28 | * @ODM\PreUpdate |
29 | 29 | */ |
30 | 30 | public function __invoke($data) |
@@ -73,7 +73,7 @@ |
||
73 | 73 | * |
74 | 74 | * Proxies to {@link render()}. |
75 | 75 | * |
76 | - * @param null|ElementInterface $element |
|
76 | + * @param null|ElementInterface $elements |
|
77 | 77 | * @param null|string $labelPosition |
78 | 78 | * @param bool $renderErrors |
79 | 79 | * @return string|FormRow |
@@ -62,7 +62,7 @@ |
||
62 | 62 | |
63 | 63 | |
64 | 64 | return sprintf( |
65 | - '<div class="controls controls-row ' . $form_row_class . '">%s%s</div>', |
|
65 | + '<div class="controls controls-row '.$form_row_class.'">%s%s</div>', |
|
66 | 66 | $labelMarkup, |
67 | 67 | $markups |
68 | 68 | ); |
@@ -42,7 +42,7 @@ |
||
42 | 42 | |
43 | 43 | /** |
44 | 44 | * @param LoggerInterface $log |
45 | - * @param null $redirect |
|
45 | + * @param \Closure $redirect |
|
46 | 46 | */ |
47 | 47 | public function __construct(LoggerInterface $log, $redirect = null) |
48 | 48 | { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * |
67 | 67 | * @param EventManagerInterface $events |
68 | 68 | * @param integer $priority |
69 | - */ |
|
69 | + */ |
|
70 | 70 | public function attach(EventManagerInterface $events, $priority = 1) |
71 | 71 | { |
72 | 72 | $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($this, 'handleError'), $priority); |
@@ -147,19 +147,19 @@ discard block |
||
147 | 147 | $error = error_get_last(); |
148 | 148 | |
149 | 149 | if ($error) { |
150 | - $this->log->err( |
|
151 | - $error['message'], |
|
152 | - array( |
|
153 | - 'errno' => $error['type'], |
|
154 | - 'file' => $error['file'], |
|
155 | - 'line' => $error['line'] |
|
156 | - ) |
|
157 | - ); |
|
158 | - if ($this->redirect && |
|
150 | + $this->log->err( |
|
151 | + $error['message'], |
|
152 | + array( |
|
153 | + 'errno' => $error['type'], |
|
154 | + 'file' => $error['file'], |
|
155 | + 'line' => $error['line'] |
|
156 | + ) |
|
157 | + ); |
|
158 | + if ($this->redirect && |
|
159 | 159 | ($error['type'] & (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR)) |
160 | - ) { |
|
161 | - if (is_callable($this->redirect)) { |
|
162 | - call_user_func($this->redirect); |
|
160 | + ) { |
|
161 | + if (is_callable($this->redirect)) { |
|
162 | + call_user_func($this->redirect); |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | } |