@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | |
43 | 43 | const REGEX_MD5 = '/^[a-f0-9]{32}$/i'; |
44 | 44 | |
45 | - /** |
|
46 | - * @var string |
|
47 | - * @see https://en.wikipedia.org/wiki/Email_address#Local-part |
|
48 | - */ |
|
45 | + /** |
|
46 | + * @var string |
|
47 | + * @see https://en.wikipedia.org/wiki/Email_address#Local-part |
|
48 | + */ |
|
49 | 49 | const REGEX_EMAIL = '/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i'; |
50 | 50 | |
51 | 51 | const REGEX_PHONE = '/\A[+0-9][0-9 +\-()]+\z/m'; |
@@ -97,14 +97,14 @@ discard block |
||
97 | 97 | */ |
98 | 98 | const REGEX_IS_HTML = '%<{0,1}[a-z\/][\s\S]*>|<[a-z\/][\s\S]*>{0,1}%i'; |
99 | 99 | |
100 | - /** |
|
101 | - * Hexadecimal color codes. Allows the following formats: |
|
102 | - * |
|
103 | - * FFFFFF |
|
104 | - * FFF |
|
105 | - * |
|
106 | - * @var string |
|
107 | - */ |
|
100 | + /** |
|
101 | + * Hexadecimal color codes. Allows the following formats: |
|
102 | + * |
|
103 | + * FFFFFF |
|
104 | + * FFF |
|
105 | + * |
|
106 | + * @var string |
|
107 | + */ |
|
108 | 108 | const REGEX_HEX_COLOR_CODE = '/\A(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\z/iU'; |
109 | 109 | |
110 | 110 | /** |
@@ -33,14 +33,14 @@ |
||
33 | 33 | { |
34 | 34 | preg_match_all('%<([A-Z][A-Z0-9]*)\b[^>]*>(.*?)</\1>%si', $html, $result, PREG_PATTERN_ORDER); |
35 | 35 | |
36 | - if(empty($result[1])) { |
|
36 | + if (empty($result[1])) { |
|
37 | 37 | return '<p>'.$text.'</p>'; |
38 | 38 | } |
39 | 39 | |
40 | 40 | $tagName = array_pop($result[1]); |
41 | 41 | $pos = strrpos($html, '</'.$tagName.'>'); |
42 | 42 | |
43 | - if(in_array(strtolower($tagName), self::$newParaTags)) { |
|
43 | + if (in_array(strtolower($tagName), self::$newParaTags)) { |
|
44 | 44 | $replace = '</'.$tagName.'><p>'.$text.'</p>'; |
45 | 45 | } else { |
46 | 46 | $replace = $text.'</'.$tagName.'>'; |
@@ -25,10 +25,10 @@ |
||
25 | 25 | * |
26 | 26 | * @return string |
27 | 27 | */ |
28 | - function render() : string; |
|
28 | + function render() : string; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Renders the string and echos it. |
32 | 32 | */ |
33 | - function display() : void; |
|
33 | + function display() : void; |
|
34 | 34 | } |
@@ -23,18 +23,18 @@ |
||
23 | 23 | * @see Microtime::ERROR_FAILED_CREATING_DATE_OBJECT |
24 | 24 | * @see Microtime::ERROR_FAILED_CONVERTING_STRING |
25 | 25 | */ |
26 | - public function __construct($datetime='now', DateTimeZone $timeZone=null) |
|
26 | + public function __construct($datetime = 'now', DateTimeZone $timeZone = null) |
|
27 | 27 | { |
28 | - if($timeZone === null) |
|
28 | + if ($timeZone === null) |
|
29 | 29 | { |
30 | 30 | $timeZone = new DateTimeZone(date_default_timezone_get()); |
31 | 31 | } |
32 | 32 | |
33 | - if(empty($datetime) || $datetime === 'now') |
|
33 | + if (empty($datetime) || $datetime === 'now') |
|
34 | 34 | { |
35 | 35 | $dateObj = DateTime::createFromFormat('0.u00 U', microtime(), new DateTimeZone('America/Denver')); |
36 | 36 | |
37 | - if($dateObj === false) { |
|
37 | + if ($dateObj === false) { |
|
38 | 38 | throw new ConvertHelper_Exception( |
39 | 39 | 'Failed to create microseconds date.', |
40 | 40 | '', |
@@ -49,8 +49,7 @@ |
||
49 | 49 | try |
50 | 50 | { |
51 | 51 | parent::__construct($datetime, $timeZone); |
52 | - } |
|
53 | - catch (Exception $e) |
|
52 | + } catch (Exception $e) |
|
54 | 53 | { |
55 | 54 | throw new ConvertHelper_Exception( |
56 | 55 | 'Failed to create date from string.', |
@@ -41,14 +41,14 @@ discard block |
||
41 | 41 | const TOKEN_MONTHS = 'm'; |
42 | 42 | const TOKEN_YEARS = 'y'; |
43 | 43 | |
44 | - /** |
|
45 | - * @var DateInterval |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var DateInterval |
|
46 | + */ |
|
47 | 47 | protected $interval; |
48 | 48 | |
49 | - /** |
|
50 | - * @var int |
|
51 | - */ |
|
49 | + /** |
|
50 | + * @var int |
|
51 | + */ |
|
52 | 52 | protected $seconds; |
53 | 53 | |
54 | 54 | /** |
@@ -92,22 +92,22 @@ discard block |
||
92 | 92 | return new ConvertHelper_DateInterval($seconds); |
93 | 93 | } |
94 | 94 | |
95 | - /** |
|
96 | - * Creates the interval from an existing regular interval instance. |
|
97 | - * |
|
98 | - * @param DateInterval $interval |
|
99 | - * @return ConvertHelper_DateInterval |
|
100 | - */ |
|
95 | + /** |
|
96 | + * Creates the interval from an existing regular interval instance. |
|
97 | + * |
|
98 | + * @param DateInterval $interval |
|
99 | + * @return ConvertHelper_DateInterval |
|
100 | + */ |
|
101 | 101 | public static function fromInterval(DateInterval $interval) |
102 | 102 | { |
103 | 103 | return self::fromSeconds(ConvertHelper::interval2seconds($interval)); |
104 | 104 | } |
105 | 105 | |
106 | - /** |
|
107 | - * Retrieves the PHP native date interval. |
|
108 | - * |
|
109 | - * @return DateInterval |
|
110 | - */ |
|
106 | + /** |
|
107 | + * Retrieves the PHP native date interval. |
|
108 | + * |
|
109 | + * @return DateInterval |
|
110 | + */ |
|
111 | 111 | public function getInterval() : DateInterval |
112 | 112 | { |
113 | 113 | return $this->interval; |
@@ -143,31 +143,31 @@ discard block |
||
143 | 143 | return $this->getToken(self::TOKEN_YEARS); |
144 | 144 | } |
145 | 145 | |
146 | - /** |
|
147 | - * Retrieves a specific time token, e.g. "h" (for hours). |
|
148 | - * Using the constants to specifiy the tokens is recommended. |
|
149 | - * |
|
150 | - * @param string $token |
|
151 | - * @return int |
|
152 | - * |
|
153 | - * @see ConvertHelper_DateInterval::TOKEN_SECONDS |
|
154 | - * @see ConvertHelper_DateInterval::TOKEN_MINUTES |
|
155 | - * @see ConvertHelper_DateInterval::TOKEN_HOURS |
|
156 | - * @see ConvertHelper_DateInterval::TOKEN_DAYS |
|
157 | - * @see ConvertHelper_DateInterval::TOKEN_MONTHS |
|
158 | - * @see ConvertHelper_DateInterval::TOKEN_YEARS |
|
159 | - */ |
|
146 | + /** |
|
147 | + * Retrieves a specific time token, e.g. "h" (for hours). |
|
148 | + * Using the constants to specifiy the tokens is recommended. |
|
149 | + * |
|
150 | + * @param string $token |
|
151 | + * @return int |
|
152 | + * |
|
153 | + * @see ConvertHelper_DateInterval::TOKEN_SECONDS |
|
154 | + * @see ConvertHelper_DateInterval::TOKEN_MINUTES |
|
155 | + * @see ConvertHelper_DateInterval::TOKEN_HOURS |
|
156 | + * @see ConvertHelper_DateInterval::TOKEN_DAYS |
|
157 | + * @see ConvertHelper_DateInterval::TOKEN_MONTHS |
|
158 | + * @see ConvertHelper_DateInterval::TOKEN_YEARS |
|
159 | + */ |
|
160 | 160 | public function getToken(string $token) : int |
161 | 161 | { |
162 | 162 | return (int)$this->interval->$token; |
163 | 163 | } |
164 | 164 | |
165 | - /** |
|
166 | - * The total amount of seconds in the interval (including |
|
167 | - * everything, from seconds to days, months, years...). |
|
168 | - * |
|
169 | - * @return int |
|
170 | - */ |
|
165 | + /** |
|
166 | + * The total amount of seconds in the interval (including |
|
167 | + * everything, from seconds to days, months, years...). |
|
168 | + * |
|
169 | + * @return int |
|
170 | + */ |
|
171 | 171 | public function getTotalSeconds() : int |
172 | 172 | { |
173 | 173 | return $this->seconds; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | $interval = $d2->diff($d1); |
70 | 70 | |
71 | - if(!$interval instanceof DateInterval) |
|
71 | + if (!$interval instanceof DateInterval) |
|
72 | 72 | { |
73 | 73 | throw new ConvertHelper_Exception( |
74 | 74 | 'Cannot create interval', |
@@ -187,24 +187,24 @@ discard block |
||
187 | 187 | * @see ConvertHelper::INTERVAL_HOURS |
188 | 188 | * @see ConvertHelper::INTERVAL_DAYS |
189 | 189 | */ |
190 | - public static function toTotal(DateInterval $interval, string $unit=ConvertHelper::INTERVAL_SECONDS) : int |
|
190 | + public static function toTotal(DateInterval $interval, string $unit = ConvertHelper::INTERVAL_SECONDS) : int |
|
191 | 191 | { |
192 | 192 | $total = (int)$interval->format('%a'); |
193 | 193 | if ($unit == ConvertHelper::INTERVAL_DAYS) { |
194 | 194 | return $total; |
195 | 195 | } |
196 | 196 | |
197 | - $total = ($total * 24) + ((int)$interval->h ); |
|
197 | + $total = ($total * 24) + ((int)$interval->h); |
|
198 | 198 | if ($unit == ConvertHelper::INTERVAL_HOURS) { |
199 | 199 | return $total; |
200 | 200 | } |
201 | 201 | |
202 | - $total = ($total * 60) + ((int)$interval->i ); |
|
202 | + $total = ($total * 60) + ((int)$interval->i); |
|
203 | 203 | if ($unit == ConvertHelper::INTERVAL_MINUTES) { |
204 | 204 | return $total; |
205 | 205 | } |
206 | 206 | |
207 | - $total = ($total * 60) + ((int)$interval->s ); |
|
207 | + $total = ($total * 60) + ((int)$interval->s); |
|
208 | 208 | if ($unit == ConvertHelper::INTERVAL_SECONDS) { |
209 | 209 | return $total; |
210 | 210 | } |
@@ -398,8 +398,7 @@ discard block |
||
398 | 398 | if($datefrom instanceof DateTime) |
399 | 399 | { |
400 | 400 | $converter->setDateFrom($datefrom); |
401 | - } |
|
402 | - else |
|
401 | + } else |
|
403 | 402 | { |
404 | 403 | $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom)); |
405 | 404 | } |
@@ -407,8 +406,7 @@ discard block |
||
407 | 406 | if($dateto instanceof DateTime) |
408 | 407 | { |
409 | 408 | $converter->setDateTo($dateto); |
410 | - } |
|
411 | - else if($dateto > 0) |
|
409 | + } else if($dateto > 0) |
|
412 | 410 | { |
413 | 411 | $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto)); |
414 | 412 | } |
@@ -34,39 +34,39 @@ discard block |
||
34 | 34 | const SECONDS_PER_MONTH_APPROX = 2505600; // imprecise - for 29 days, only for approximations. |
35 | 35 | const SECONDS_PER_YEAR = 31536000; |
36 | 36 | |
37 | - /** |
|
38 | - * @var int |
|
39 | - */ |
|
37 | + /** |
|
38 | + * @var int |
|
39 | + */ |
|
40 | 40 | protected $dateFrom; |
41 | 41 | |
42 | - /** |
|
43 | - * @var int |
|
44 | - */ |
|
42 | + /** |
|
43 | + * @var int |
|
44 | + */ |
|
45 | 45 | protected $dateTo; |
46 | 46 | |
47 | - /** |
|
48 | - * @var bool |
|
49 | - */ |
|
47 | + /** |
|
48 | + * @var bool |
|
49 | + */ |
|
50 | 50 | protected $future = false; |
51 | 51 | |
52 | - /** |
|
53 | - * @var string |
|
54 | - */ |
|
52 | + /** |
|
53 | + * @var string |
|
54 | + */ |
|
55 | 55 | protected $interval = ''; |
56 | 56 | |
57 | - /** |
|
58 | - * @var int |
|
59 | - */ |
|
57 | + /** |
|
58 | + * @var int |
|
59 | + */ |
|
60 | 60 | protected $difference = 0; |
61 | 61 | |
62 | - /** |
|
63 | - * @var int |
|
64 | - */ |
|
62 | + /** |
|
63 | + * @var int |
|
64 | + */ |
|
65 | 65 | protected $dateDiff = 0; |
66 | 66 | |
67 | - /** |
|
68 | - * @var array<string,array<string,string>>|NULL |
|
69 | - */ |
|
67 | + /** |
|
68 | + * @var array<string,array<string,string>>|NULL |
|
69 | + */ |
|
70 | 70 | protected static $texts = null; |
71 | 71 | |
72 | 72 | public function __construct() |
@@ -86,17 +86,17 @@ discard block |
||
86 | 86 | self::$texts = null; |
87 | 87 | } |
88 | 88 | |
89 | - /** |
|
90 | - * Sets the origin date to calculate from. |
|
91 | - * |
|
92 | - * NOTE: if this is further in the future than |
|
93 | - * the to: date, it will be considered as a |
|
94 | - * calculation for something to come, i.e. |
|
95 | - * "In two days". |
|
96 | - * |
|
97 | - * @param DateTime $date |
|
98 | - * @return ConvertHelper_DurationConverter |
|
99 | - */ |
|
89 | + /** |
|
90 | + * Sets the origin date to calculate from. |
|
91 | + * |
|
92 | + * NOTE: if this is further in the future than |
|
93 | + * the to: date, it will be considered as a |
|
94 | + * calculation for something to come, i.e. |
|
95 | + * "In two days". |
|
96 | + * |
|
97 | + * @param DateTime $date |
|
98 | + * @return ConvertHelper_DurationConverter |
|
99 | + */ |
|
100 | 100 | public function setDateFrom(DateTime $date) : ConvertHelper_DurationConverter |
101 | 101 | { |
102 | 102 | $this->dateFrom = ConvertHelper::date2timestamp($date); |
@@ -104,13 +104,13 @@ discard block |
||
104 | 104 | return $this; |
105 | 105 | } |
106 | 106 | |
107 | - /** |
|
108 | - * Sets the date to calculate to. Defaults to |
|
109 | - * the current time if not set. |
|
110 | - * |
|
111 | - * @param DateTime $date |
|
112 | - * @return ConvertHelper_DurationConverter |
|
113 | - */ |
|
107 | + /** |
|
108 | + * Sets the date to calculate to. Defaults to |
|
109 | + * the current time if not set. |
|
110 | + * |
|
111 | + * @param DateTime $date |
|
112 | + * @return ConvertHelper_DurationConverter |
|
113 | + */ |
|
114 | 114 | public function setDateTo(DateTime $date) : ConvertHelper_DurationConverter |
115 | 115 | { |
116 | 116 | $this->dateTo = ConvertHelper::date2timestamp($date); |
@@ -118,14 +118,14 @@ discard block |
||
118 | 118 | return $this; |
119 | 119 | } |
120 | 120 | |
121 | - /** |
|
122 | - * Converts the specified dates to a human-readable string. |
|
123 | - * |
|
124 | - * @throws ConvertHelper_Exception |
|
125 | - * @return string |
|
126 | - * |
|
127 | - * @see ConvertHelper_DurationConverter::ERROR_NO_DATE_FROM_SET |
|
128 | - */ |
|
121 | + /** |
|
122 | + * Converts the specified dates to a human-readable string. |
|
123 | + * |
|
124 | + * @throws ConvertHelper_Exception |
|
125 | + * @return string |
|
126 | + * |
|
127 | + * @see ConvertHelper_DurationConverter::ERROR_NO_DATE_FROM_SET |
|
128 | + */ |
|
129 | 129 | public function convert() : string |
130 | 130 | { |
131 | 131 | $this->initTexts(); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | public function __construct() |
73 | 73 | { |
74 | - if(class_exists('\AppLocalize\Localization')) { |
|
74 | + if (class_exists('\AppLocalize\Localization')) { |
|
75 | 75 | \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged')); |
76 | 76 | } |
77 | 77 | } |
@@ -133,11 +133,11 @@ discard block |
||
133 | 133 | |
134 | 134 | $epoch = 'past'; |
135 | 135 | $key = 'singular'; |
136 | - if($this->dateDiff > 1) { |
|
136 | + if ($this->dateDiff > 1) { |
|
137 | 137 | $key = 'plural'; |
138 | 138 | } |
139 | 139 | |
140 | - if($this->future) { |
|
140 | + if ($this->future) { |
|
141 | 141 | $epoch = 'future'; |
142 | 142 | } |
143 | 143 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | |
151 | 151 | protected function initTexts() : void |
152 | 152 | { |
153 | - if(isset(self::$texts)) { |
|
153 | + if (isset(self::$texts)) { |
|
154 | 154 | return; |
155 | 155 | } |
156 | 156 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | $day = (int)date("j", $this->dateTo); |
237 | 237 | $year = (int)date("Y", $this->dateFrom); |
238 | 238 | |
239 | - while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
239 | + while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
240 | 240 | { |
241 | 241 | $months_difference++; |
242 | 242 | } |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | |
257 | 257 | protected function resolveCalculations() : void |
258 | 258 | { |
259 | - if(!isset($this->dateFrom)) |
|
259 | + if (!isset($this->dateFrom)) |
|
260 | 260 | { |
261 | 261 | throw new ConvertHelper_Exception( |
262 | 262 | 'No date from has been specified.', |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | } |
267 | 267 | |
268 | 268 | // no date to set? Assume we want to use today. |
269 | - if(!isset($this->dateTo)) |
|
269 | + if (!isset($this->dateTo)) |
|
270 | 270 | { |
271 | 271 | $this->dateTo = time(); |
272 | 272 | } |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | |
334 | 334 | $difference = $this->dateTo - $this->dateFrom; |
335 | 335 | |
336 | - if($difference < 0) |
|
336 | + if ($difference < 0) |
|
337 | 337 | { |
338 | 338 | $difference = $difference * -1; |
339 | 339 | $this->future = true; |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | { |
396 | 396 | $converter = new ConvertHelper_DurationConverter(); |
397 | 397 | |
398 | - if($datefrom instanceof DateTime) |
|
398 | + if ($datefrom instanceof DateTime) |
|
399 | 399 | { |
400 | 400 | $converter->setDateFrom($datefrom); |
401 | 401 | } |
@@ -404,11 +404,11 @@ discard block |
||
404 | 404 | $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom)); |
405 | 405 | } |
406 | 406 | |
407 | - if($dateto instanceof DateTime) |
|
407 | + if ($dateto instanceof DateTime) |
|
408 | 408 | { |
409 | 409 | $converter->setDateTo($dateto); |
410 | 410 | } |
411 | - else if($dateto > 0) |
|
411 | + else if ($dateto > 0) |
|
412 | 412 | { |
413 | 413 | $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto)); |
414 | 414 | } |
@@ -43,13 +43,13 @@ discard block |
||
43 | 43 | * @param bool $short |
44 | 44 | * @return string|NULL |
45 | 45 | */ |
46 | - public static function toDayName(DateTime $date, bool $short=false) : ?string |
|
46 | + public static function toDayName(DateTime $date, bool $short = false) : ?string |
|
47 | 47 | { |
48 | 48 | $day = $date->format('l'); |
49 | 49 | $invariant = self::getDayNamesInvariant(); |
50 | 50 | |
51 | 51 | $idx = array_search($day, $invariant); |
52 | - if($idx !== false) { |
|
52 | + if ($idx !== false) { |
|
53 | 53 | $localized = self::getDayNames($short); |
54 | 54 | return $localized[$idx]; |
55 | 55 | } |
@@ -72,11 +72,11 @@ discard block |
||
72 | 72 | * @param bool $short |
73 | 73 | * @return string[] |
74 | 74 | */ |
75 | - public static function getDayNames(bool $short=false) : array |
|
75 | + public static function getDayNames(bool $short = false) : array |
|
76 | 76 | { |
77 | 77 | self::initDays(); |
78 | 78 | |
79 | - if($short) { |
|
79 | + if ($short) { |
|
80 | 80 | return self::$daysShort; |
81 | 81 | } |
82 | 82 | |
@@ -102,13 +102,13 @@ discard block |
||
102 | 102 | public static function toListLabel(DateTime $date, bool $includeTime = false, bool $shortMonth = false) : string |
103 | 103 | { |
104 | 104 | $today = new DateTime(); |
105 | - if($date->format('d.m.Y') === $today->format('d.m.Y')) |
|
105 | + if ($date->format('d.m.Y') === $today->format('d.m.Y')) |
|
106 | 106 | { |
107 | 107 | $label = t('Today'); |
108 | 108 | } |
109 | 109 | else |
110 | 110 | { |
111 | - $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' '; |
|
111 | + $label = $date->format('d').'. '.self::month2string((int)$date->format('m'), $shortMonth).' '; |
|
112 | 112 | |
113 | 113 | if ($date->format('Y') != date('Y')) |
114 | 114 | { |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | private static function initDays() : void |
215 | 215 | { |
216 | - if(!empty(self::$daysShort)) |
|
216 | + if (!empty(self::$daysShort)) |
|
217 | 217 | { |
218 | 218 | return; |
219 | 219 | } |
@@ -105,8 +105,7 @@ |
||
105 | 105 | if($date->format('d.m.Y') === $today->format('d.m.Y')) |
106 | 106 | { |
107 | 107 | $label = t('Today'); |
108 | - } |
|
109 | - else |
|
108 | + } else |
|
110 | 109 | { |
111 | 110 | $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' '; |
112 | 111 |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public static function removeKeys(array &$sourceArray, array $keys) : void |
17 | 17 | { |
18 | - foreach($keys as $key) |
|
18 | + foreach ($keys as $key) |
|
19 | 19 | { |
20 | - if(array_key_exists($key, $sourceArray)) { |
|
20 | + if (array_key_exists($key, $sourceArray)) { |
|
21 | 21 | unset($sourceArray[$key]); |
22 | 22 | } |
23 | 23 | } |
@@ -31,18 +31,18 @@ discard block |
||
31 | 31 | * @param bool $keepKeys Whether to maintain index association |
32 | 32 | * @return array<number|string,mixed> |
33 | 33 | */ |
34 | - public static function removeValues(array $sourceArray, array $values, bool $keepKeys=false) : array |
|
34 | + public static function removeValues(array $sourceArray, array $values, bool $keepKeys = false) : array |
|
35 | 35 | { |
36 | 36 | $result = array(); |
37 | 37 | $values = array_values($values); |
38 | 38 | |
39 | - foreach($sourceArray as $key => $value) |
|
39 | + foreach ($sourceArray as $key => $value) |
|
40 | 40 | { |
41 | - if(in_array($value, $values, true)) { |
|
41 | + if (in_array($value, $values, true)) { |
|
42 | 42 | continue; |
43 | 43 | } |
44 | 44 | |
45 | - if($keepKeys) { |
|
45 | + if ($keepKeys) { |
|
46 | 46 | $result[$key] = $value; |
47 | 47 | continue; |
48 | 48 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | public static function toStyleString(array $subject) : string |
76 | 76 | { |
77 | 77 | $tokens = array(); |
78 | - foreach($subject as $name => $value) { |
|
78 | + foreach ($subject as $name => $value) { |
|
79 | 79 | $tokens[] = $name.':'.strval($value); |
80 | 80 | } |
81 | 81 | |
@@ -104,18 +104,18 @@ discard block |
||
104 | 104 | public static function toAttributeString(array $array) : string |
105 | 105 | { |
106 | 106 | $tokens = array(); |
107 | - foreach($array as $attr => $value) |
|
107 | + foreach ($array as $attr => $value) |
|
108 | 108 | { |
109 | 109 | $value = strval($value); |
110 | 110 | |
111 | - if($value === '') { |
|
111 | + if ($value === '') { |
|
112 | 112 | continue; |
113 | 113 | } |
114 | 114 | |
115 | 115 | $tokens[] = $attr.'="'.htmlspecialchars($value, ENT_QUOTES, 'UTF-8').'"'; |
116 | 116 | } |
117 | 117 | |
118 | - if(empty($tokens)) { |
|
118 | + if (empty($tokens)) { |
|
119 | 119 | return ''; |
120 | 120 | } |
121 | 121 | |
@@ -136,17 +136,17 @@ discard block |
||
136 | 136 | */ |
137 | 137 | public static function implodeWithAnd(array $list, string $sep = ', ', string $conjunction = '') : string |
138 | 138 | { |
139 | - if(empty($list)) { |
|
139 | + if (empty($list)) { |
|
140 | 140 | return ''; |
141 | 141 | } |
142 | 142 | |
143 | - if(empty($conjunction)) { |
|
143 | + if (empty($conjunction)) { |
|
144 | 144 | $conjunction = ' '.t('and').' '; |
145 | 145 | } |
146 | 146 | |
147 | 147 | $last = array_pop($list); |
148 | - if($list) { |
|
149 | - return implode($sep, $list) . $conjunction . $last; |
|
148 | + if ($list) { |
|
149 | + return implode($sep, $list).$conjunction.$last; |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | return $last; |
@@ -33,24 +33,24 @@ discard block |
||
33 | 33 | */ |
34 | 34 | class StringBuilder implements StringBuilder_Interface |
35 | 35 | { |
36 | - /** |
|
37 | - * @var string |
|
38 | - */ |
|
36 | + /** |
|
37 | + * @var string |
|
38 | + */ |
|
39 | 39 | protected $separator = ' '; |
40 | 40 | |
41 | - /** |
|
42 | - * @var string[] |
|
43 | - */ |
|
41 | + /** |
|
42 | + * @var string[] |
|
43 | + */ |
|
44 | 44 | protected $strings = array(); |
45 | 45 | |
46 | - /** |
|
47 | - * @var string |
|
48 | - */ |
|
46 | + /** |
|
47 | + * @var string |
|
48 | + */ |
|
49 | 49 | protected $mode = 'html'; |
50 | 50 | |
51 | - /** |
|
52 | - * @var string |
|
53 | - */ |
|
51 | + /** |
|
52 | + * @var string |
|
53 | + */ |
|
54 | 54 | protected $noSpace = '§!§'; |
55 | 55 | |
56 | 56 | public function __construct() |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | |
59 | 59 | } |
60 | 60 | |
61 | - /** |
|
62 | - * Adds a subject as a string. Is ignored if empty. |
|
63 | - * |
|
64 | - * @param string|number|StringBuilder_Interface $string |
|
65 | - * @return $this |
|
66 | - */ |
|
61 | + /** |
|
62 | + * Adds a subject as a string. Is ignored if empty. |
|
63 | + * |
|
64 | + * @param string|number|StringBuilder_Interface $string |
|
65 | + * @return $this |
|
66 | + */ |
|
67 | 67 | public function add($string) : StringBuilder |
68 | 68 | { |
69 | 69 | $string = strval($string); |
@@ -76,57 +76,57 @@ discard block |
||
76 | 76 | return $this; |
77 | 77 | } |
78 | 78 | |
79 | - /** |
|
80 | - * Adds a string without appending an automatic space. |
|
81 | - * |
|
82 | - * @param string|number|StringBuilder_Interface $string |
|
83 | - * @return $this |
|
84 | - */ |
|
79 | + /** |
|
80 | + * Adds a string without appending an automatic space. |
|
81 | + * |
|
82 | + * @param string|number|StringBuilder_Interface $string |
|
83 | + * @return $this |
|
84 | + */ |
|
85 | 85 | public function nospace($string) : StringBuilder |
86 | 86 | { |
87 | 87 | return $this->add($this->noSpace.strval($string)); |
88 | 88 | } |
89 | 89 | |
90 | - /** |
|
91 | - * Adds raw HTML code. Does not add an automatic space. |
|
92 | - * |
|
93 | - * @param string|number|StringBuilder_Interface $html |
|
94 | - * @return $this |
|
95 | - */ |
|
90 | + /** |
|
91 | + * Adds raw HTML code. Does not add an automatic space. |
|
92 | + * |
|
93 | + * @param string|number|StringBuilder_Interface $html |
|
94 | + * @return $this |
|
95 | + */ |
|
96 | 96 | public function html($html) : StringBuilder |
97 | 97 | { |
98 | 98 | return $this->nospace($html); |
99 | 99 | } |
100 | 100 | |
101 | - /** |
|
102 | - * Adds an unordered list with the specified items. |
|
103 | - * |
|
104 | - * @param array<int,string|number|StringBuilder_Interface> $items |
|
105 | - * @return $this |
|
106 | - */ |
|
101 | + /** |
|
102 | + * Adds an unordered list with the specified items. |
|
103 | + * |
|
104 | + * @param array<int,string|number|StringBuilder_Interface> $items |
|
105 | + * @return $this |
|
106 | + */ |
|
107 | 107 | public function ul(array $items) : StringBuilder |
108 | 108 | { |
109 | 109 | return $this->list('ul', $items); |
110 | 110 | } |
111 | 111 | |
112 | - /** |
|
113 | - * Adds an ordered list with the specified items. |
|
114 | - * |
|
115 | - * @param array<int,string|number|StringBuilder_Interface> $items |
|
116 | - * @return $this |
|
117 | - */ |
|
112 | + /** |
|
113 | + * Adds an ordered list with the specified items. |
|
114 | + * |
|
115 | + * @param array<int,string|number|StringBuilder_Interface> $items |
|
116 | + * @return $this |
|
117 | + */ |
|
118 | 118 | public function ol(array $items) : StringBuilder |
119 | 119 | { |
120 | 120 | return $this->list('ol', $items); |
121 | 121 | } |
122 | 122 | |
123 | - /** |
|
124 | - * Creates a list tag with the items list. |
|
125 | - * |
|
126 | - * @param string $type The list type, `ol` or `ul`. |
|
127 | - * @param array<int,string|number|StringBuilder_Interface> $items |
|
128 | - * @return $this |
|
129 | - */ |
|
123 | + /** |
|
124 | + * Creates a list tag with the items list. |
|
125 | + * |
|
126 | + * @param string $type The list type, `ol` or `ul`. |
|
127 | + * @param array<int,string|number|StringBuilder_Interface> $items |
|
128 | + * @return $this |
|
129 | + */ |
|
130 | 130 | protected function list(string $type, array $items) : StringBuilder |
131 | 131 | { |
132 | 132 | return $this->html(sprintf( |
@@ -136,13 +136,13 @@ discard block |
||
136 | 136 | )); |
137 | 137 | } |
138 | 138 | |
139 | - /** |
|
140 | - * Add a translated string. |
|
141 | - * |
|
142 | - * @param string $format The native string to translate. |
|
143 | - * @param array<int,mixed> $arguments The variables to inject into the translated string, if any. |
|
144 | - * @return $this |
|
145 | - */ |
|
139 | + /** |
|
140 | + * Add a translated string. |
|
141 | + * |
|
142 | + * @param string $format The native string to translate. |
|
143 | + * @param array<int,mixed> $arguments The variables to inject into the translated string, if any. |
|
144 | + * @return $this |
|
145 | + */ |
|
146 | 146 | public function t(string $format, ...$arguments) : StringBuilder |
147 | 147 | { |
148 | 148 | if(!class_exists('\AppLocalize\Localization')) |
@@ -195,36 +195,36 @@ discard block |
||
195 | 195 | return $this->add(ConvertHelper::duration2string($since)); |
196 | 196 | } |
197 | 197 | |
198 | - /** |
|
199 | - * Adds HTML double quotes around the string. |
|
200 | - * |
|
201 | - * @param string|number|StringBuilder_Interface $string |
|
202 | - * @return $this |
|
203 | - */ |
|
198 | + /** |
|
199 | + * Adds HTML double quotes around the string. |
|
200 | + * |
|
201 | + * @param string|number|StringBuilder_Interface $string |
|
202 | + * @return $this |
|
203 | + */ |
|
204 | 204 | public function quote($string) |
205 | 205 | { |
206 | 206 | return $this->sf('"%s"', strval($string)); |
207 | 207 | } |
208 | 208 | |
209 | - /** |
|
210 | - * Adds a text that is meant as a reference to an UI element, |
|
211 | - * like a menu item, button, etc. |
|
212 | - * |
|
213 | - * @param string|number|StringBuilder_Interface $string |
|
214 | - * @return $this |
|
215 | - */ |
|
209 | + /** |
|
210 | + * Adds a text that is meant as a reference to an UI element, |
|
211 | + * like a menu item, button, etc. |
|
212 | + * |
|
213 | + * @param string|number|StringBuilder_Interface $string |
|
214 | + * @return $this |
|
215 | + */ |
|
216 | 216 | public function reference($string) : StringBuilder |
217 | 217 | { |
218 | 218 | return $this->sf('"%s"', $string); |
219 | 219 | } |
220 | 220 | |
221 | - /** |
|
222 | - * Add a string using the `sprintf` method. |
|
223 | - * |
|
224 | - * @param string $format The format string |
|
225 | - * @param string|number|StringBuilder_Interface ...$arguments The variables to inject |
|
226 | - * @return $this |
|
227 | - */ |
|
221 | + /** |
|
222 | + * Add a string using the `sprintf` method. |
|
223 | + * |
|
224 | + * @param string $format The format string |
|
225 | + * @param string|number|StringBuilder_Interface ...$arguments The variables to inject |
|
226 | + * @return $this |
|
227 | + */ |
|
228 | 228 | public function sf(string $format, ...$arguments) : StringBuilder |
229 | 229 | { |
230 | 230 | array_unshift($arguments, $format); |
@@ -232,12 +232,12 @@ discard block |
||
232 | 232 | return $this->add(call_user_func_array('sprintf', $arguments)); |
233 | 233 | } |
234 | 234 | |
235 | - /** |
|
236 | - * Adds a bold string. |
|
237 | - * |
|
238 | - * @param string|number|StringBuilder_Interface $string |
|
239 | - * @return $this |
|
240 | - */ |
|
235 | + /** |
|
236 | + * Adds a bold string. |
|
237 | + * |
|
238 | + * @param string|number|StringBuilder_Interface $string |
|
239 | + * @return $this |
|
240 | + */ |
|
241 | 241 | public function bold($string) : StringBuilder |
242 | 242 | { |
243 | 243 | return $this->sf( |
@@ -246,15 +246,15 @@ discard block |
||
246 | 246 | ); |
247 | 247 | } |
248 | 248 | |
249 | - /** |
|
250 | - * Adds an HTML `<br>` tag. |
|
251 | - * |
|
252 | - * Note: for adding a newline character instead, |
|
253 | - * use {@see StringBuilder::eol()}. |
|
254 | - * |
|
255 | - * @return $this |
|
256 | - * @see StringBuilder::eol() |
|
257 | - */ |
|
249 | + /** |
|
250 | + * Adds an HTML `<br>` tag. |
|
251 | + * |
|
252 | + * Note: for adding a newline character instead, |
|
253 | + * use {@see StringBuilder::eol()}. |
|
254 | + * |
|
255 | + * @return $this |
|
256 | + * @see StringBuilder::eol() |
|
257 | + */ |
|
258 | 258 | public function nl() : StringBuilder |
259 | 259 | { |
260 | 260 | return $this->html('<br>'); |
@@ -271,42 +271,42 @@ discard block |
||
271 | 271 | return $this->nospace(PHP_EOL); |
272 | 272 | } |
273 | 273 | |
274 | - /** |
|
275 | - * Adds the current time, in the format <code>H:i:s</code>. |
|
276 | - * |
|
277 | - * @return $this |
|
278 | - */ |
|
274 | + /** |
|
275 | + * Adds the current time, in the format <code>H:i:s</code>. |
|
276 | + * |
|
277 | + * @return $this |
|
278 | + */ |
|
279 | 279 | public function time() : StringBuilder |
280 | 280 | { |
281 | 281 | return $this->add(date('H:i:s')); |
282 | 282 | } |
283 | 283 | |
284 | - /** |
|
285 | - * Adds the "Note:" text. |
|
286 | - * |
|
287 | - * @return $this |
|
288 | - */ |
|
284 | + /** |
|
285 | + * Adds the "Note:" text. |
|
286 | + * |
|
287 | + * @return $this |
|
288 | + */ |
|
289 | 289 | public function note() : StringBuilder |
290 | 290 | { |
291 | 291 | return $this->t('Note:'); |
292 | 292 | } |
293 | 293 | |
294 | - /** |
|
295 | - * Like {@see StringBuilder::note()}, but as bold text. |
|
296 | - * |
|
297 | - * @return $this |
|
298 | - */ |
|
294 | + /** |
|
295 | + * Like {@see StringBuilder::note()}, but as bold text. |
|
296 | + * |
|
297 | + * @return $this |
|
298 | + */ |
|
299 | 299 | public function noteBold() : StringBuilder |
300 | 300 | { |
301 | 301 | return $this->bold(sb()->note()); |
302 | 302 | } |
303 | 303 | |
304 | - /** |
|
305 | - * Adds the "Hint:" text. |
|
306 | - * |
|
307 | - * @return $this |
|
308 | - * @see StringBuilder::hintBold() |
|
309 | - */ |
|
304 | + /** |
|
305 | + * Adds the "Hint:" text. |
|
306 | + * |
|
307 | + * @return $this |
|
308 | + * @see StringBuilder::hintBold() |
|
309 | + */ |
|
310 | 310 | public function hint() : StringBuilder |
311 | 311 | { |
312 | 312 | return $this->t('Hint:'); |
@@ -322,12 +322,12 @@ discard block |
||
322 | 322 | return $this->bold(sb()->hint()); |
323 | 323 | } |
324 | 324 | |
325 | - /** |
|
326 | - * Adds two linebreaks. |
|
327 | - * |
|
328 | - * @param StringBuilder_Interface|string|NULL $content |
|
329 | - * @return $this |
|
330 | - */ |
|
325 | + /** |
|
326 | + * Adds two linebreaks. |
|
327 | + * |
|
328 | + * @param StringBuilder_Interface|string|NULL $content |
|
329 | + * @return $this |
|
330 | + */ |
|
331 | 331 | public function para($content=null) : StringBuilder |
332 | 332 | { |
333 | 333 | if($content !== null) { |
@@ -337,14 +337,14 @@ discard block |
||
337 | 337 | return $this->nl()->nl(); |
338 | 338 | } |
339 | 339 | |
340 | - /** |
|
341 | - * Adds an anchor HTML tag. |
|
342 | - * |
|
343 | - * @param string $label |
|
344 | - * @param string $url |
|
345 | - * @param bool $newTab |
|
346 | - * @return $this |
|
347 | - */ |
|
340 | + /** |
|
341 | + * Adds an anchor HTML tag. |
|
342 | + * |
|
343 | + * @param string $label |
|
344 | + * @param string $url |
|
345 | + * @param bool $newTab |
|
346 | + * @return $this |
|
347 | + */ |
|
348 | 348 | public function link(string $label, string $url, bool $newTab=false) : StringBuilder |
349 | 349 | { |
350 | 350 | $target = ''; |
@@ -360,12 +360,12 @@ discard block |
||
360 | 360 | ); |
361 | 361 | } |
362 | 362 | |
363 | - /** |
|
364 | - * Wraps the string in a `code` tag. |
|
365 | - * |
|
366 | - * @param string|number|StringBuilder_Interface $string |
|
367 | - * @return $this |
|
368 | - */ |
|
363 | + /** |
|
364 | + * Wraps the string in a `code` tag. |
|
365 | + * |
|
366 | + * @param string|number|StringBuilder_Interface $string |
|
367 | + * @return $this |
|
368 | + */ |
|
369 | 369 | public function code($string) : StringBuilder |
370 | 370 | { |
371 | 371 | return $this->sf( |
@@ -374,24 +374,24 @@ discard block |
||
374 | 374 | ); |
375 | 375 | } |
376 | 376 | |
377 | - /** |
|
378 | - * Wraps the string in a `pre` tag. |
|
379 | - * |
|
380 | - * @param string|number|StringBuilder_Interface $string |
|
381 | - * @return $this |
|
382 | - */ |
|
377 | + /** |
|
378 | + * Wraps the string in a `pre` tag. |
|
379 | + * |
|
380 | + * @param string|number|StringBuilder_Interface $string |
|
381 | + * @return $this |
|
382 | + */ |
|
383 | 383 | public function pre($string) : StringBuilder |
384 | 384 | { |
385 | 385 | return $this->sf('<pre>%s</pre>', strval($string)); |
386 | 386 | } |
387 | 387 | |
388 | - /** |
|
389 | - * Wraps the text in a `span` tag with the specified classes. |
|
390 | - * |
|
391 | - * @param string|number|StringBuilder_Interface $string |
|
392 | - * @param string|string[] $classes |
|
393 | - * @return $this |
|
394 | - */ |
|
388 | + /** |
|
389 | + * Wraps the text in a `span` tag with the specified classes. |
|
390 | + * |
|
391 | + * @param string|number|StringBuilder_Interface $string |
|
392 | + * @param string|string[] $classes |
|
393 | + * @return $this |
|
394 | + */ |
|
395 | 395 | public function spanned($string, $classes) : StringBuilder |
396 | 396 | { |
397 | 397 | if(!is_array($classes)) |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | $string = strval($string); |
70 | 70 | |
71 | - if(!empty($string)) |
|
71 | + if (!empty($string)) |
|
72 | 72 | { |
73 | 73 | $this->strings[] = $string; |
74 | 74 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | */ |
146 | 146 | public function t(string $format, ...$arguments) : StringBuilder |
147 | 147 | { |
148 | - if(!class_exists('\AppLocalize\Localization')) |
|
148 | + if (!class_exists('\AppLocalize\Localization')) |
|
149 | 149 | { |
150 | 150 | array_unshift($arguments, $format); |
151 | 151 | return $this->sf(...$arguments); |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | { |
171 | 171 | unset($context); // Only used by the localization parser. |
172 | 172 | |
173 | - if(!class_exists('\AppLocalize\Localization')) |
|
173 | + if (!class_exists('\AppLocalize\Localization')) |
|
174 | 174 | { |
175 | 175 | array_unshift($arguments, $format); |
176 | 176 | return $this->sf(...$arguments); |
@@ -328,9 +328,9 @@ discard block |
||
328 | 328 | * @param StringBuilder_Interface|string|NULL $content |
329 | 329 | * @return $this |
330 | 330 | */ |
331 | - public function para($content=null) : StringBuilder |
|
331 | + public function para($content = null) : StringBuilder |
|
332 | 332 | { |
333 | - if($content !== null) { |
|
333 | + if ($content !== null) { |
|
334 | 334 | return $this->html('<p>')->nospace($content)->html('</p>'); |
335 | 335 | } |
336 | 336 | |
@@ -345,10 +345,10 @@ discard block |
||
345 | 345 | * @param bool $newTab |
346 | 346 | * @return $this |
347 | 347 | */ |
348 | - public function link(string $label, string $url, bool $newTab=false) : StringBuilder |
|
348 | + public function link(string $label, string $url, bool $newTab = false) : StringBuilder |
|
349 | 349 | { |
350 | 350 | $target = ''; |
351 | - if($newTab) { |
|
351 | + if ($newTab) { |
|
352 | 352 | $target = ' target="_blank"'; |
353 | 353 | } |
354 | 354 | |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | */ |
395 | 395 | public function spanned($string, $classes) : StringBuilder |
396 | 396 | { |
397 | - if(!is_array($classes)) |
|
397 | + if (!is_array($classes)) |
|
398 | 398 | { |
399 | 399 | $classes = array(strval($classes)); |
400 | 400 | } |