Skip to content

Commit af13e66

Browse files
mcaskillmcaskill
committed
Update coding styles using EditorConfig
1 parent 40c3331 commit af13e66

File tree

4 files changed

+102
-85
lines changed

4 files changed

+102
-85
lines changed

‎.editorconfig‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
end_of_line = lf
8+
insert_final_newline = true
9+
indent_size = 2
10+
indent_style = space
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
trim_trailing_whitespace = false
15+
16+
[*.{json,php,xml,xml.dist}]
17+
indent_size = 4

‎Function.HTML-Build-Attributes.php‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
<?php
22

33
if (!function_exists('html_build_attributes')) {
4-
/**
5-
* Generate a string of HTML attributes
6-
*
7-
* @param array $attr Associative array of attribute names and values.
8-
* @param callable|null $callback Callback function to escape values for HTML attributes.
9-
* Defaults to `htmlspecialchars()`.
10-
* @return string Returns a string of HTML attributes.
11-
*/
12-
function html_build_attributes(array $attr, callable $callback = null)
13-
{
14-
if (!count($attr)) {
15-
return '';
16-
}
4+
/**
5+
* Generate a string of HTML attributes
6+
*
7+
* @param array $attr Associative array of attribute names and values.
8+
* @param callable|null $callback Callback function to escape values for HTML attributes.
9+
* Defaults to `htmlspecialchars()`.
10+
* @return string Returns a string of HTML attributes.
11+
*/
12+
function html_build_attributes(array $attr, callable $callback = null)
13+
{
14+
if (!count($attr)) {
15+
return '';
16+
}
1717

18-
$html = array_map(
19-
function ($val, $key) use ($callback) {
20-
if (is_bool($val)) {
21-
return ($val ? $key : '');
22-
} elseif (isset($val)) {
23-
if ($val instanceof Closure) {
24-
$val = $val();
25-
} elseif ($val instanceof JsonSerializable) {
26-
$val = json_encode(
27-
$val->jsonSerialize(),
28-
(JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE)
29-
);
30-
} elseif (is_callable([ $val, 'toArray' ])) {
31-
$val = $val->toArray();
32-
} elseif (is_callable([ $val, '__toString' ])) {
33-
$val = strval($val);
34-
}
18+
$html = array_map(
19+
function ($val, $key) use ($callback) {
20+
if (is_bool($val)) {
21+
return ($val ? $key : '');
22+
} elseif (isset($val)) {
23+
if ($val instanceof Closure) {
24+
$val = $val();
25+
} elseif ($val instanceof JsonSerializable) {
26+
$val = json_encode(
27+
$val->jsonSerialize(),
28+
(JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE)
29+
);
30+
} elseif (is_callable([ $val, 'toArray' ])) {
31+
$val = $val->toArray();
32+
} elseif (is_callable([ $val, '__toString' ])) {
33+
$val = strval($val);
34+
}
3535

36-
if (is_array($val)) {
37-
if (function_exists('is_blank')) {
38-
$filter = function ($var) {
39-
return !is_blank($var);
40-
};
41-
} else {
42-
$filter = function ($var) {
43-
return !empty($var) || is_numeric($var);
44-
};
45-
}
46-
$val = implode(' ', array_filter($val, $filter));
47-
}
36+
if (is_array($val)) {
37+
if (function_exists('is_blank')) {
38+
$filter = function ($var) {
39+
return !is_blank($var);
40+
};
41+
} else {
42+
$filter = function ($var) {
43+
return !empty($var) || is_numeric($var);
44+
};
45+
}
46+
$val = implode(' ', array_filter($val, $filter));
47+
}
4848

49-
if (is_callable($callback)) {
50-
$val = call_user_func($callback, $val);
51-
} elseif (function_exists('esc_attr')) {
52-
$val = esc_attr($val);
53-
} else {
54-
$val = htmlspecialchars($val, ENT_QUOTES);
55-
}
49+
if (is_callable($callback)) {
50+
$val = call_user_func($callback, $val);
51+
} elseif (function_exists('esc_attr')) {
52+
$val = esc_attr($val);
53+
} else {
54+
$val = htmlspecialchars($val, ENT_QUOTES);
55+
}
5656

57-
if (is_string($val)) {
58-
return sprintf('%1$s="%2$s"', $key, $val);
59-
}
60-
}
61-
},
62-
$attr,
63-
array_keys($attr)
64-
);
57+
if (is_string($val)) {
58+
return sprintf('%1$s="%2$s"', $key, $val);
59+
}
60+
}
61+
},
62+
$attr,
63+
array_keys($attr)
64+
);
6565

66-
return implode(' ', $html);
67-
}
66+
return implode(' ', $html);
67+
}
6868
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ $ composer require mcaskill/php-html-build-attributes
3535

3636
### Without Composer
3737

38-
Why are you not using [composer](http://getcomposer.org/)? Download `Function.HTML-Build-Attributes.php` from the gist and save the file into your project path somewhere.
38+
Why are you not using [composer](http://getcomposer.org/)? Download `Function.HTML-Build-Attributes.php` from the gist and save the file into your project path somewhere.

‎composer.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2-
"name": "mcaskill/php-html-build-attributes",
3-
"description": "Generate a string of HTML attributes.",
4-
"license": "MIT",
5-
"authors": [
6-
{
7-
"name": "Chauncey McAskill",
8-
"email": "chauncey@mcaskill.ca",
9-
"homepage": "https://github.com/mcaskill"
2+
"name": "mcaskill/php-html-build-attributes",
3+
"description": "Generate a string of HTML attributes.",
4+
"license": "MIT",
5+
"authors": [
6+
{
7+
"name": "Chauncey McAskill",
8+
"email": "chauncey@mcaskill.ca",
9+
"homepage": "https://github.com/mcaskill"
10+
}
11+
],
12+
"keywords": [
13+
"function",
14+
"wordpress"
15+
],
16+
"extra": {
17+
"branch-alias": {
18+
"dev-master": "1.x-dev"
19+
}
20+
},
21+
"require": {
22+
"php": ">=5.4.0"
23+
},
24+
"autoload": {
25+
"files": [ "Function.HTML-Build-Attributes.php" ]
1026
}
11-
],
12-
"keywords": [
13-
"function",
14-
"wordpress"
15-
],
16-
"extra": {
17-
"branch-alias": {
18-
"dev-master": "1.x-dev"
19-
}
20-
},
21-
"require": {
22-
"php": ">=5.4.0"
23-
},
24-
"autoload": {
25-
"files": [ "Function.HTML-Build-Attributes.php" ]
26-
}
27-
}
27+
}

0 commit comments

Comments
 (0)