woocommerce/storefront
2
0
Fork 0
mirror of https://github.com/woocommerce/storefront.git synced 2025-08-21 04:11:59 +08:00
Code Issues Packages Wiki Activity Actions

reinstate phpcs php linting (#1463)

Browse source 
* update squizlabs/php_codesniffer and WP coding standards to latest

* revamp phpcs sniffer rulesets:
- update to php-compatibility (wimg is defunct)
- add version for woocommerce-sniffs

* streamline phpcs config (get it working at all):
- update min WP version to 5.3
- remove references to rules we don't have installed
  - WordPress.VIP
  - WordPress.XSS

* fix 2x phpcs errors (automatically via phpcbf)

* update phps ignore unescaped output comment to current format

* add npm scripts for php linter and linter autofixer

* auto-fix PHP linter errors using phpcbf :

Before phpcbf:

[x] PEAR      Functions           Function call signature multiple arguments          127
[x] Generic   White space         Disallow space indent spaces used                   10
[ ] WordPres  WP                  Enqueued resource parameters missing version        6
[ ] PHPCompa  Language construct  New language constructs t_ns_separator found        4
[ ] WordPres  Security            Escape output output not escaped                    4
[ ] PHPCompa  Parameter values    New HTMLEntities encoding default not set           2
[ ] WordPres  Date time           Restricted functions date_date                      2
[x] Generic   Files               End file newline not found                          1
[x] PEAR      Functions           Function call signature close bracket line          1
[x] PEAR      Functions           Function call signature content after open bracket  1
[x] Squiz     White space         Superfluous whitespace end line                     1
[x] WordPres  Arrays              Comma after array item no comma                     1

phpcbf fixed all [x] violations, all whitespace/formatting

After phpcbf:

WordPres  WP                  Enqueued resource parameters missing version      6
PHPCompa  Language construct  New language constructs t_ns_separator found      4
WordPres  Security            Escape output output not escaped                  4
PHPCompa  Parameter values    New HTMLEntities encoding default not set         2
WordPres  Date time           Restricted functions date_date                    2

Note - this commit does not include auto-fixed files with other
violations. These will follow in separate commit (after fixing!)

* fix phpcs violations:
- numerous formatting issues fixed automatically
- manually fix missing version param in calls to wp_enqueue_style

* fix phpcs violations:
- numerous formatting issues fixed automatically
- fix missing deps param in call to wp_enqueue_style

* update phpcs test php version to match min requirement (5.6)

* fix phpcs violations including some missing escaping:
- numerous formatting issues fixed automatically
- prefer gmdate() over potentially ambiguous date()
- escape output (a real issue!) of comment dates

* fix violations (all automated formatting fixes)

* reinstate WordPress rule/standard in phpcs.xml (minimise PR changes)

* exclude build (pre-zip) ./storefront & tighten excludes for dep folders

* bulk-update Security.EscapeOutput.OutputNotEscaped ignore comment:
- the previous comment format is no longer supported
- bulk replacing these to reduce phpcs warning overhead
This commit is contained in:
Rua Haszard 2020-09-17 11:28:22 +12:00 • committed by Seghir Nadir
parent 5189064d7a
commit 7bd2171866
No known key found for this signature in database
GPG key ID: 65750D713E9C2DC0
20 changed files with 595 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

8
404.php
View file

@ -47,7 +47,8 @@ get_header(); ?>
echo '<h2>' . esc_html__( 'Product Categories', 'storefront' ) . '</h2>'; echo '<h2>' . esc_html__( 'Product Categories', 'storefront' ) . '</h2>';
the_widget( the_widget(
'WC_Widget_Product_Categories', array( 'WC_Widget_Product_Categories',
array(
'count' => 1, 'count' => 1,
) )
); );
@ -61,13 +62,14 @@ get_header(); ?>
echo '<h2>' . esc_html__( 'Popular Products', 'storefront' ) . '</h2>'; echo '<h2>' . esc_html__( 'Popular Products', 'storefront' ) . '</h2>';
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'best_selling_products', array( 'best_selling_products',
array(
'per_page' => 4, 'per_page' => 4,
'columns' => 4, 'columns' => 4,
) )
); );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
echo '</section>'; echo '</section>';
} }

7
comments.php
View file

@ -25,12 +25,14 @@ if ( post_password_required() ) {
?> ?>
<h2 class="comments-title"> <h2 class="comments-title">
<?php <?php
printf( // WPCS: XSS OK. // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
printf(
/* translators: 1: number of comments, 2: post title */ /* translators: 1: number of comments, 2: post title */
esc_html( _nx( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'storefront' ) ), esc_html( _nx( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'storefront' ) ),
number_format_i18n( get_comments_number() ), number_format_i18n( get_comments_number() ),
'<span>' . get_the_title() . '</span>' '<span>' . get_the_title() . '</span>'
); );
// phpcs:enable
?> ?>
</h2> </h2>
@ -72,7 +74,8 @@ if ( post_password_required() ) {
endif; endif;
$args = apply_filters( $args = apply_filters(
'storefront_comment_form_args', array( 'storefront_comment_form_args',
array(
'title_reply_before' => '<span id="reply-title" class="gamma comment-reply-title">', 'title_reply_before' => '<span id="reply-title" class="gamma comment-reply-title">',
'title_reply_after' => '</span>', 'title_reply_after' => '</span>',
) )

12
composer.json
View file

@ -8,12 +8,12 @@
"composer/installers": "1.9.0" "composer/installers": "1.9.0"
}, },
"require-dev": { "require-dev": {
"squizlabs/php_codesniffer": "*", "squizlabs/php_codesniffer": "3.5.6",
"wp-coding-standards/wpcs": "0.14.1", "wp-coding-standards/wpcs": "2.3.0",
"woocommerce/woocommerce-sniffs": "0.1.0",
"phpcompatibility/php-compatibility": "9.3.5",
"phpunit/phpunit": "6.5.14", "phpunit/phpunit": "6.5.14",
"woocommerce/woocommerce-git-hooks": "*", "woocommerce/woocommerce-git-hooks": "*",
"woocommerce/woocommerce-sniffs": "*",
"wimg/php-compatibility": "8.2.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.7.0" "dealerdirect/phpcodesniffer-composer-installer": "0.7.0"
}, },
"scripts": { "scripts": {
@ -33,10 +33,10 @@
"phpunit" "phpunit"
], ],
"phpcs": [ "phpcs": [
"phpcs -s -p" "phpcs --extensions=php -s -p"
], ],
"phpcbf": [ "phpcbf": [
"phpcbf -p" "phpcbf --extensions=php -p"
] ]
}, },
"extra": { "extra": {

393
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "f10b5d194649da461c7b22c4773ff7ba", "content-hash": "cd47bed164fdbbbc580f4f4fcd7a3007",
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
@ -283,20 +283,20 @@
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.9.5", "version": "1.10.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/DeepCopy.git", "url": "https://github.com/myclabs/DeepCopy.git",
"reference": "b2c28789e80a97badd14145fda39b545d83ca3ef" "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
"reference": "b2c28789e80a97badd14145fda39b545d83ca3ef", "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^7.1 || ^8.0"
}, },
"replace": { "replace": {
"myclabs/deep-copy": "self.version" "myclabs/deep-copy": "self.version"
@ -327,7 +327,13 @@
"object", "object",
"object graph" "object graph"
], ],
"time": "2020-01-17T21:11:47+00:00" "funding": [
{
"url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
"type": "tidelift"
}
],
"time": "2020-06-29T13:22:24+00:00"
}, },
{ {
"name": "phar-io/manifest", "name": "phar-io/manifest",
@ -432,26 +438,186 @@
"time": "2017-03-05T17:38:23+00:00" "time": "2017-03-05T17:38:23+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpcompatibility/php-compatibility",
"version": "2.1.0", "version": "9.3.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git", "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
"reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
"reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=5.3",
"squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
},
"conflict": {
"squizlabs/php_codesniffer": "2.6.2"
},
"require-dev": {
"phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
"type": "phpcodesniffer-standard",
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0-or-later"
],
"authors": [
{
"name": "Wim Godden",
"homepage": "https://github.com/wimg",
"role": "lead"
},
{
"name": "Juliette Reinders Folmer",
"homepage": "https://github.com/jrfnl",
"role": "lead"
},
{
"name": "Contributors",
"homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
}
],
"description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
"homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
"keywords": [
"compatibility",
"phpcs",
"standards"
],
"time": "2019-12-27T09:44:58+00:00"
},
{
"name": "phpcompatibility/phpcompatibility-paragonie",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git",
"reference": "b862bc32f7e860d0b164b199bd995e690b4b191c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/b862bc32f7e860d0b164b199bd995e690b4b191c",
"reference": "b862bc32f7e860d0b164b199bd995e690b4b191c",
"shasum": ""
},
"require": {
"phpcompatibility/php-compatibility": "^9.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
"paragonie/random_compat": "dev-master",
"paragonie/sodium_compat": "dev-master"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
"type": "phpcodesniffer-standard",
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0-or-later"
],
"authors": [
{
"name": "Wim Godden",
"role": "lead"
},
{
"name": "Juliette Reinders Folmer",
"role": "lead"
}
],
"description": "A set of rulesets for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by the Paragonie polyfill libraries.",
"homepage": "http://phpcompatibility.com/",
"keywords": [
"compatibility",
"paragonie",
"phpcs",
"polyfill",
"standards"
],
"time": "2019-11-04T15:17:54+00:00"
},
{
"name": "phpcompatibility/phpcompatibility-wp",
"version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git",
"reference": "41bef18ba688af638b7310666db28e1ea9158b2f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/41bef18ba688af638b7310666db28e1ea9158b2f",
"reference": "41bef18ba688af638b7310666db28e1ea9158b2f",
"shasum": ""
},
"require": {
"phpcompatibility/php-compatibility": "^9.0",
"phpcompatibility/phpcompatibility-paragonie": "^1.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
"type": "phpcodesniffer-standard",
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0-or-later"
],
"authors": [
{
"name": "Wim Godden",
"role": "lead"
},
{
"name": "Juliette Reinders Folmer",
"role": "lead"
}
],
"description": "A ruleset for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by WordPress.",
"homepage": "http://phpcompatibility.com/",
"keywords": [
"compatibility",
"phpcs",
"standards",
"wordpress"
],
"time": "2019-08-28T14:22:28+00:00"
},
{
"name": "phpdocumentor/reflection-common",
"version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
"reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.x-dev" "dev-2.x": "2.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -478,32 +644,31 @@
"reflection", "reflection",
"static analysis" "static analysis"
], ],
"time": "2020-04-27T09:25:28+00:00" "time": "2020-06-27T09:03:43+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "5.1.0", "version": "5.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44",
"reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-filter": "^7.1", "ext-filter": "*",
"php": "^7.2", "php": "^7.2 || ^8.0",
"phpdocumentor/reflection-common": "^2.0", "phpdocumentor/reflection-common": "^2.2",
"phpdocumentor/type-resolver": "^1.0", "phpdocumentor/type-resolver": "^1.3",
"webmozart/assert": "^1" "webmozart/assert": "^1.9.1"
}, },
"require-dev": { "require-dev": {
"doctrine/instantiator": "^1", "mockery/mockery": "~1.3.2"
"mockery/mockery": "^1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -531,34 +696,33 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2020-02-22T12:28:44+00:00" "time": "2020-08-15T11:14:08+00:00"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "1.1.0", "version": "1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95" "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95", "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2", "php": "^7.2 || ^8.0",
"phpdocumentor/reflection-common": "^2.0" "phpdocumentor/reflection-common": "^2.0"
}, },
"require-dev": { "require-dev": {
"ext-tokenizer": "^7.2", "ext-tokenizer": "*"
"mockery/mockery": "~1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.x-dev" "dev-1.x": "1.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -577,7 +741,7 @@
} }
], ],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2020-02-18T18:59:58+00:00" "time": "2020-06-27T10:12:23+00:00"
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
@ -889,6 +1053,7 @@
"keywords": [ "keywords": [
"tokenizer" "tokenizer"
], ],
"abandoned": true,
"time": "2017-11-27T05:48:46+00:00" "time": "2017-11-27T05:48:46+00:00"
}, },
{ {
@ -1596,16 +1761,16 @@
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
"version": "3.3.0", "version": "3.5.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266" "reference": "e97627871a7eab2f70e59166072a6b767d5834e0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0",
"reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "reference": "e97627871a7eab2f70e59166072a6b767d5834e0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1638,25 +1803,25 @@
} }
], ],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "http://www.squizlabs.com/php-codesniffer", "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"keywords": [ "keywords": [
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2018-06-06T23:58:19+00:00" "time": "2020-08-10T04:50:15+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.17.0", "version": "v1.18.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1668,7 +1833,11 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.17-dev" "dev-master": "1.18-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
} }
}, },
"autoload": { "autoload": {
@ -1715,27 +1884,27 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-05-12T16:14:59+00:00" "time": "2020-07-14T12:35:20+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",
"version": "1.1.3", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/theseer/tokenizer.git", "url": "https://github.com/theseer/tokenizer.git",
"reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" "reference": "75a63c33a8577608444246075ea0af0d052e452a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
"reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "reference": "75a63c33a8577608444246075ea0af0d052e452a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"php": "^7.0" "php": "^7.2 || ^8.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -1755,27 +1924,34 @@
} }
], ],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"time": "2019-06-13T22:48:21+00:00" "funding": [
{
"url": "https://github.com/theseer",
"type": "github"
}
],
"time": "2020-07-12T23:59:07+00:00"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
"version": "1.8.0", "version": "1.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/webmozart/assert.git", "url": "https://github.com/webmozart/assert.git",
"reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
"reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.3 || ^7.0", "php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8" "symfony/polyfill-ctype": "^1.8"
}, },
"conflict": { "conflict": {
"phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<3.9.1" "vimeo/psalm": "<3.9.1"
}, },
"require-dev": { "require-dev": {
@ -1803,61 +1979,7 @@
"check", "check",
"validate" "validate"
], ],
"time": "2020-04-18T12:12:48+00:00" "time": "2020-07-08T17:02:28+00:00"
},
{
"name": "wimg/php-compatibility",
"version": "8.2.0",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
"reference": "eaf613c1a8265bcfd7b0ab690783f2aef519f78a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/eaf613c1a8265bcfd7b0ab690783f2aef519f78a",
"reference": "eaf613c1a8265bcfd7b0ab690783f2aef519f78a",
"shasum": ""
},
"require": {
"php": ">=5.3",
"squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
},
"conflict": {
"squizlabs/php_codesniffer": "2.6.2"
},
"require-dev": {
"phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
"type": "phpcodesniffer-standard",
"autoload": {
"psr-4": {
"PHPCompatibility\\": "PHPCompatibility/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0-or-later"
],
"authors": [
{
"name": "Wim Godden",
"role": "lead"
}
],
"description": "A set of sniffs for PHP_CodeSniffer that checks for PHP version compatibility.",
"homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
"keywords": [
"compatibility",
"phpcs",
"standards"
],
"abandoned": "phpcompatibility/php-compatibility",
"time": "2018-07-17T13:42:26+00:00"
}, },
{ {
"name": "woocommerce/woocommerce-git-hooks", "name": "woocommerce/woocommerce-git-hooks",
@ -1894,24 +2016,23 @@
}, },
{ {
"name": "woocommerce/woocommerce-sniffs", "name": "woocommerce/woocommerce-sniffs",
"version": "0.0.2", "version": "0.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/woocommerce/woocommerce-sniffs.git", "url": "https://github.com/woocommerce/woocommerce-sniffs.git",
"reference": "2890fd5d98b318f62acb42f2b5cd6d02627cfd82" "reference": "b72b7dd2e70aa6aed16f80cdae5b1e6cce2e4c79"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/2890fd5d98b318f62acb42f2b5cd6d02627cfd82", "url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/b72b7dd2e70aa6aed16f80cdae5b1e6cce2e4c79",
"reference": "2890fd5d98b318f62acb42f2b5cd6d02627cfd82", "reference": "b72b7dd2e70aa6aed16f80cdae5b1e6cce2e4c79",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"dealerdirect/phpcodesniffer-composer-installer": "0.7.0",
"php": ">=7.0", "php": ">=7.0",
"squizlabs/php_codesniffer": "^3.0.2" "phpcompatibility/phpcompatibility-wp": "2.1.0",
}, "wp-coding-standards/wpcs": "2.3.0"
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
}, },
"type": "phpcodesniffer-standard", "type": "phpcodesniffer-standard",
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -1931,28 +2052,34 @@
"woocommerce", "woocommerce",
"wordpress" "wordpress"
], ],
"time": "2018-03-22T18:39:19+00:00" "time": "2020-08-06T18:23:45+00:00"
}, },
{ {
"name": "wp-coding-standards/wpcs", "name": "wp-coding-standards/wpcs",
"version": "0.14.1", "version": "2.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/WordPress/WordPress-Coding-Standards.git", "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
"reference": "cf6b310caad735816caef7573295f8a534374706" "reference": "7da1894633f168fe244afc6de00d141f27517b62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/cf6b310caad735816caef7573295f8a534374706", "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7da1894633f168fe244afc6de00d141f27517b62",
"reference": "cf6b310caad735816caef7573295f8a534374706", "reference": "7da1894633f168fe244afc6de00d141f27517b62",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3", "php": ">=5.4",
"squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2" "squizlabs/php_codesniffer": "^3.3.1"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6",
"phpcompatibility/php-compatibility": "^9.0",
"phpcsstandards/phpcsdevtools": "^1.0",
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
}, },
"suggest": { "suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3" "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
}, },
"type": "phpcodesniffer-standard", "type": "phpcodesniffer-standard",
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -1962,7 +2089,7 @@
"authors": [ "authors": [
{ {
"name": "Contributors", "name": "Contributors",
"homepage": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/graphs/contributors" "homepage": "https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors"
} }
], ],
"description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions", "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions",
@ -1971,7 +2098,7 @@
"standards", "standards",
"wordpress" "wordpress"
], ],
"time": "2018-02-16T01:57:48+00:00" "time": "2020-05-13T23:57:56+00:00"
} }
], ],
"aliases": [], "aliases": [],

14
inc/admin/class-storefront-admin.php
View file

@ -37,7 +37,7 @@ if ( ! class_exists( 'Storefront_Admin' ) ) :
global $storefront_version; global $storefront_version;
if ( 'appearance_page_storefront-welcome' === $hook_suffix ) { if ( 'appearance_page_storefront-welcome' === $hook_suffix ) {
wp_enqueue_style( 'storefront-welcome-screen', get_template_directory_uri() . '/assets/css/admin/welcome-screen/welcome.css', $storefront_version ); wp_enqueue_style( 'storefront-welcome-screen', get_template_directory_uri() . '/assets/css/admin/welcome-screen/welcome.css', array(), $storefront_version );
wp_style_add_data( 'storefront-welcome-screen', 'rtl', 'replace' ); wp_style_add_data( 'storefront-welcome-screen', 'rtl', 'replace' );
} }
} }
@ -191,8 +191,10 @@ if ( ! class_exists( 'Storefront_Admin' ) ) :
array( array(
'action' => 'install-plugin', 'action' => 'install-plugin',
'plugin' => $plugin_slug, 'plugin' => $plugin_slug,
), self_admin_url( 'update.php' ) ),
), 'install-plugin_' . $plugin_slug self_admin_url( 'update.php' )
),
'install-plugin_' . $plugin_slug
); );
$button = array( $button = array(
'message' => esc_attr__( 'Install now', 'storefront' ), 'message' => esc_attr__( 'Install now', 'storefront' ),
@ -223,8 +225,10 @@ if ( ! class_exists( 'Storefront_Admin' ) ) :
array( array(
'action' => 'activate', 'action' => 'activate',
'plugin' => $plugin_file, 'plugin' => $plugin_file,
), admin_url( 'plugins.php' ) ),
), 'activate-plugin_' . $plugin_file admin_url( 'plugins.php' )
),
'activate-plugin_' . $plugin_file
); );
return $url; return $url;
} }

12
inc/admin/class-storefront-plugin-install.php
View file

@ -87,8 +87,10 @@ if ( ! class_exists( 'Storefront_Plugin_Install' ) ) :
array( array(
'action' => 'install-plugin', 'action' => 'install-plugin',
'plugin' => $plugin_slug, 'plugin' => $plugin_slug,
), self_admin_url( 'update.php' ) ),
), 'install-plugin_' . $plugin_slug self_admin_url( 'update.php' )
),
'install-plugin_' . $plugin_slug
); );
$button = array( $button = array(
'message' => esc_attr__( 'Install now', 'storefront' ), 'message' => esc_attr__( 'Install now', 'storefront' ),
@ -132,8 +134,10 @@ if ( ! class_exists( 'Storefront_Plugin_Install' ) ) :
array( array(
'action' => 'activate', 'action' => 'activate',
'plugin' => $plugin_file, 'plugin' => $plugin_file,
), admin_url( 'plugins.php' ) ),
), 'activate-plugin_' . $plugin_file admin_url( 'plugins.php' )
),
'activate-plugin_' . $plugin_file
); );
return $url; return $url;
} }

97
inc/class-storefront.php
View file

@ -75,8 +75,10 @@ if ( ! class_exists( 'Storefront' ) ) :
* Enable support for site logo. * Enable support for site logo.
*/ */
add_theme_support( add_theme_support(
'custom-logo', apply_filters( 'custom-logo',
'storefront_custom_logo_args', array( apply_filters(
'storefront_custom_logo_args',
array(
'height' => 110, 'height' => 110,
'width' => 470, 'width' => 470,
'flex-width' => true, 'flex-width' => true,
@ -90,7 +92,8 @@ if ( ! class_exists( 'Storefront' ) ) :
*/ */
register_nav_menus( register_nav_menus(
apply_filters( apply_filters(
'storefront_register_nav_menus', array( 'storefront_register_nav_menus',
array(
'primary' => __( 'Primary Menu', 'storefront' ), 'primary' => __( 'Primary Menu', 'storefront' ),
'secondary' => __( 'Secondary Menu', 'storefront' ), 'secondary' => __( 'Secondary Menu', 'storefront' ),
'handheld' => __( 'Handheld Menu', 'storefront' ), 'handheld' => __( 'Handheld Menu', 'storefront' ),
@ -103,8 +106,10 @@ if ( ! class_exists( 'Storefront' ) ) :
* to output valid HTML5. * to output valid HTML5.
*/ */
add_theme_support( add_theme_support(
'html5', apply_filters( 'html5',
'storefront_html5_args', array( apply_filters(
'storefront_html5_args',
array(
'search-form', 'search-form',
'comment-form', 'comment-form',
'comment-list', 'comment-list',
@ -121,8 +126,10 @@ if ( ! class_exists( 'Storefront' ) ) :
* Setup the WordPress core custom background feature. * Setup the WordPress core custom background feature.
*/ */
add_theme_support( add_theme_support(
'custom-background', apply_filters( 'custom-background',
'storefront_custom_background_args', array( apply_filters(
'storefront_custom_background_args',
array(
'default-color' => apply_filters( 'storefront_default_background_color', 'ffffff' ), 'default-color' => apply_filters( 'storefront_default_background_color', 'ffffff' ),
'default-image' => '', 'default-image' => '',
) )
@ -133,8 +140,10 @@ if ( ! class_exists( 'Storefront' ) ) :
* Setup the WordPress core custom header feature. * Setup the WordPress core custom header feature.
*/ */
add_theme_support( add_theme_support(
'custom-header', apply_filters( 'custom-header',
'storefront_custom_header_args', array( apply_filters(
'storefront_custom_header_args',
array(
'default-image' => '', 'default-image' => '',
'header-text' => false, 'header-text' => false,
'width' => 1950, 'width' => 1950,
@ -151,8 +160,10 @@ if ( ! class_exists( 'Storefront' ) ) :
* http://jetpack.me/ * http://jetpack.me/
*/ */
add_theme_support( add_theme_support(
'site-logo', apply_filters( 'site-logo',
'storefront_site_logo_args', array( apply_filters(
'storefront_site_logo_args',
array(
'size' => 'full', 'size' => 'full',
) )
) )
@ -186,33 +197,36 @@ if ( ! class_exists( 'Storefront' ) ) :
/** /**
* Add support for editor font sizes. * Add support for editor font sizes.
*/ */
add_theme_support( 'editor-font-sizes', array( add_theme_support(
'editor-font-sizes',
array( array(
'name' => __( 'Small', 'storefront' ), array(
'size' => 14, 'name' => __( 'Small', 'storefront' ),
'slug' => 'small', 'size' => 14,
), 'slug' => 'small',
array( ),
'name' => __( 'Normal', 'storefront' ), array(
'size' => 16, 'name' => __( 'Normal', 'storefront' ),
'slug' => 'normal', 'size' => 16,
), 'slug' => 'normal',
array( ),
'name' => __( 'Medium', 'storefront' ), array(
'size' => 23, 'name' => __( 'Medium', 'storefront' ),
'slug' => 'medium', 'size' => 23,
), 'slug' => 'medium',
array( ),
'name' => __( 'Large', 'storefront' ), array(
'size' => 26, 'name' => __( 'Large', 'storefront' ),
'slug' => 'large', 'size' => 26,
), 'slug' => 'large',
array( ),
'name' => __( 'Huge', 'storefront' ), array(
'size' => 37, 'name' => __( 'Huge', 'storefront' ),
'slug' => 'huge', 'size' => 37,
), 'slug' => 'huge',
) ); ),
)
);
/** /**
* Enqueue editor styles. * Enqueue editor styles.
@ -323,7 +337,7 @@ if ( ! class_exists( 'Storefront' ) ) :
/** /**
* Fonts * Fonts
*/ */
wp_enqueue_style( 'storefront-fonts', $this->google_fonts(), array(), null ); wp_enqueue_style( 'storefront-fonts', $this->google_fonts(), array(), $storefront_version );
/** /**
* Scripts * Scripts
@ -361,7 +375,8 @@ if ( ! class_exists( 'Storefront' ) ) :
*/ */
public function google_fonts() { public function google_fonts() {
$google_fonts = apply_filters( $google_fonts = apply_filters(
'storefront_google_font_families', array( 'storefront_google_font_families',
array(
'source-sans-pro' => 'Source+Sans+Pro:400,300,300italic,400italic,600,700,900', 'source-sans-pro' => 'Source+Sans+Pro:400,300,300italic,400italic,600,700,900',
) )
); );
@ -516,7 +531,9 @@ if ( ! class_exists( 'Storefront' ) ) :
* Add styles for embeds * Add styles for embeds
*/ */
public function print_embed_styles() { public function print_embed_styles() {
wp_enqueue_style( 'source-sans-pro', '//fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,300italic,400italic,700,900' ); global $storefront_version;
wp_enqueue_style( 'source-sans-pro', '//fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,300italic,400italic,700,900', array(), $storefront_version );
$accent_color = get_theme_mod( 'storefront_accent_color' ); $accent_color = get_theme_mod( 'storefront_accent_color' );
$background_color = storefront_get_content_background_color(); $background_color = storefront_get_content_background_color();
?> ?>

173
inc/customizer/class-storefront-customizer.php
View file

@ -39,7 +39,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
*/ */
public function get_storefront_default_setting_values() { public function get_storefront_default_setting_values() {
return apply_filters( return apply_filters(
'storefront_setting_default_values', $args = array( 'storefront_setting_default_values',
$args = array(
'storefront_heading_color' => '#333333', 'storefront_heading_color' => '#333333',
'storefront_text_color' => '#6d6d6d', 'storefront_text_color' => '#6d6d6d',
'storefront_accent_color' => '#96588a', 'storefront_accent_color' => '#96588a',
@ -132,21 +133,24 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage'; $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
$wp_customize->selective_refresh->add_partial( $wp_customize->selective_refresh->add_partial(
'custom_logo', array( 'custom_logo',
array(
'selector' => '.site-branding', 'selector' => '.site-branding',
'render_callback' => array( $this, 'get_site_logo' ), 'render_callback' => array( $this, 'get_site_logo' ),
) )
); );
$wp_customize->selective_refresh->add_partial( $wp_customize->selective_refresh->add_partial(
'blogname', array( 'blogname',
array(
'selector' => '.site-title.beta a', 'selector' => '.site-title.beta a',
'render_callback' => array( $this, 'get_site_name' ), 'render_callback' => array( $this, 'get_site_name' ),
) )
); );
$wp_customize->selective_refresh->add_partial( $wp_customize->selective_refresh->add_partial(
'blogdescription', array( 'blogdescription',
array(
'selector' => '.site-description', 'selector' => '.site-description',
'render_callback' => array( $this, 'get_site_description' ), 'render_callback' => array( $this, 'get_site_description' ),
) )
@ -167,7 +171,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Add the typography section * Add the typography section
*/ */
$wp_customize->add_section( $wp_customize->add_section(
'storefront_typography', array( 'storefront_typography',
array(
'title' => __( 'Typography', 'storefront' ), 'title' => __( 'Typography', 'storefront' ),
'priority' => 45, 'priority' => 45,
) )
@ -177,7 +182,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Heading color * Heading color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_heading_color', array( 'storefront_heading_color',
array(
'default' => apply_filters( 'storefront_default_heading_color', '#484c51' ), 'default' => apply_filters( 'storefront_default_heading_color', '#484c51' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -185,7 +191,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_heading_color', array( $wp_customize,
'storefront_heading_color',
array(
'label' => __( 'Heading color', 'storefront' ), 'label' => __( 'Heading color', 'storefront' ),
'section' => 'storefront_typography', 'section' => 'storefront_typography',
'settings' => 'storefront_heading_color', 'settings' => 'storefront_heading_color',
@ -198,7 +206,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Text Color * Text Color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_text_color', array( 'storefront_text_color',
array(
'default' => apply_filters( 'storefront_default_text_color', '#43454b' ), 'default' => apply_filters( 'storefront_default_text_color', '#43454b' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -206,7 +215,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_text_color', array( $wp_customize,
'storefront_text_color',
array(
'label' => __( 'Text color', 'storefront' ), 'label' => __( 'Text color', 'storefront' ),
'section' => 'storefront_typography', 'section' => 'storefront_typography',
'settings' => 'storefront_text_color', 'settings' => 'storefront_text_color',
@ -219,7 +230,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Accent Color * Accent Color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_accent_color', array( 'storefront_accent_color',
array(
'default' => apply_filters( 'storefront_default_accent_color', '#96588a' ), 'default' => apply_filters( 'storefront_default_accent_color', '#96588a' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -227,7 +239,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_accent_color', array( $wp_customize,
'storefront_accent_color',
array(
'label' => __( 'Link / accent color', 'storefront' ), 'label' => __( 'Link / accent color', 'storefront' ),
'section' => 'storefront_typography', 'section' => 'storefront_typography',
'settings' => 'storefront_accent_color', 'settings' => 'storefront_accent_color',
@ -240,7 +254,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Hero Heading Color * Hero Heading Color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_hero_heading_color', array( 'storefront_hero_heading_color',
array(
'default' => apply_filters( 'storefront_default_hero_heading_color', '#000000' ), 'default' => apply_filters( 'storefront_default_hero_heading_color', '#000000' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -248,11 +263,13 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_hero_heading_color', array( $wp_customize,
'label' => __( 'Hero heading color', 'storefront' ), 'storefront_hero_heading_color',
'section' => 'storefront_typography', array(
'settings' => 'storefront_hero_heading_color', 'label' => __( 'Hero heading color', 'storefront' ),
'priority' => 50, 'section' => 'storefront_typography',
'settings' => 'storefront_hero_heading_color',
'priority' => 50,
) )
) )
); );
@ -261,7 +278,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Hero Text Color * Hero Text Color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_hero_text_color', array( 'storefront_hero_text_color',
array(
'default' => apply_filters( 'storefront_default_hero_text_color', '#000000' ), 'default' => apply_filters( 'storefront_default_hero_text_color', '#000000' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -269,18 +287,22 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_hero_text_color', array( $wp_customize,
'label' => __( 'Hero text color', 'storefront' ), 'storefront_hero_text_color',
'section' => 'storefront_typography', array(
'settings' => 'storefront_hero_text_color', 'label' => __( 'Hero text color', 'storefront' ),
'priority' => 60, 'section' => 'storefront_typography',
'settings' => 'storefront_hero_text_color',
'priority' => 60,
) )
) )
); );
$wp_customize->add_control( $wp_customize->add_control(
new Arbitrary_Storefront_Control( new Arbitrary_Storefront_Control(
$wp_customize, 'storefront_header_image_heading', array( $wp_customize,
'storefront_header_image_heading',
array(
'section' => 'header_image', 'section' => 'header_image',
'type' => 'heading', 'type' => 'heading',
'label' => __( 'Header background image', 'storefront' ), 'label' => __( 'Header background image', 'storefront' ),
@ -293,7 +315,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Header Background * Header Background
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_header_background_color', array( 'storefront_header_background_color',
array(
'default' => apply_filters( 'storefront_default_header_background_color', '#2c2d33' ), 'default' => apply_filters( 'storefront_default_header_background_color', '#2c2d33' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -301,7 +324,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_header_background_color', array( $wp_customize,
'storefront_header_background_color',
array(
'label' => __( 'Background color', 'storefront' ), 'label' => __( 'Background color', 'storefront' ),
'section' => 'header_image', 'section' => 'header_image',
'settings' => 'storefront_header_background_color', 'settings' => 'storefront_header_background_color',
@ -314,7 +339,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Header text color * Header text color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_header_text_color', array( 'storefront_header_text_color',
array(
'default' => apply_filters( 'storefront_default_header_text_color', '#9aa0a7' ), 'default' => apply_filters( 'storefront_default_header_text_color', '#9aa0a7' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -322,7 +348,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_header_text_color', array( $wp_customize,
'storefront_header_text_color',
array(
'label' => __( 'Text color', 'storefront' ), 'label' => __( 'Text color', 'storefront' ),
'section' => 'header_image', 'section' => 'header_image',
'settings' => 'storefront_header_text_color', 'settings' => 'storefront_header_text_color',
@ -335,7 +363,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Header link color * Header link color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_header_link_color', array( 'storefront_header_link_color',
array(
'default' => apply_filters( 'storefront_default_header_link_color', '#d5d9db' ), 'default' => apply_filters( 'storefront_default_header_link_color', '#d5d9db' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -343,7 +372,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_header_link_color', array( $wp_customize,
'storefront_header_link_color',
array(
'label' => __( 'Link color', 'storefront' ), 'label' => __( 'Link color', 'storefront' ),
'section' => 'header_image', 'section' => 'header_image',
'settings' => 'storefront_header_link_color', 'settings' => 'storefront_header_link_color',
@ -356,7 +387,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Footer section * Footer section
*/ */
$wp_customize->add_section( $wp_customize->add_section(
'storefront_footer', array( 'storefront_footer',
array(
'title' => __( 'Footer', 'storefront' ), 'title' => __( 'Footer', 'storefront' ),
'priority' => 28, 'priority' => 28,
'description' => __( 'Customize the look & feel of your website footer.', 'storefront' ), 'description' => __( 'Customize the look & feel of your website footer.', 'storefront' ),
@ -367,7 +399,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Footer Background * Footer Background
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_footer_background_color', array( 'storefront_footer_background_color',
array(
'default' => apply_filters( 'storefront_default_footer_background_color', '#f0f0f0' ), 'default' => apply_filters( 'storefront_default_footer_background_color', '#f0f0f0' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -375,7 +408,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_footer_background_color', array( $wp_customize,
'storefront_footer_background_color',
array(
'label' => __( 'Background color', 'storefront' ), 'label' => __( 'Background color', 'storefront' ),
'section' => 'storefront_footer', 'section' => 'storefront_footer',
'settings' => 'storefront_footer_background_color', 'settings' => 'storefront_footer_background_color',
@ -388,7 +423,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Footer heading color * Footer heading color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_footer_heading_color', array( 'storefront_footer_heading_color',
array(
'default' => apply_filters( 'storefront_default_footer_heading_color', '#494c50' ), 'default' => apply_filters( 'storefront_default_footer_heading_color', '#494c50' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -396,7 +432,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_footer_heading_color', array( $wp_customize,
'storefront_footer_heading_color',
array(
'label' => __( 'Heading color', 'storefront' ), 'label' => __( 'Heading color', 'storefront' ),
'section' => 'storefront_footer', 'section' => 'storefront_footer',
'settings' => 'storefront_footer_heading_color', 'settings' => 'storefront_footer_heading_color',
@ -409,7 +447,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Footer text color * Footer text color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_footer_text_color', array( 'storefront_footer_text_color',
array(
'default' => apply_filters( 'storefront_default_footer_text_color', '#61656b' ), 'default' => apply_filters( 'storefront_default_footer_text_color', '#61656b' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -417,7 +456,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_footer_text_color', array( $wp_customize,
'storefront_footer_text_color',
array(
'label' => __( 'Text color', 'storefront' ), 'label' => __( 'Text color', 'storefront' ),
'section' => 'storefront_footer', 'section' => 'storefront_footer',
'settings' => 'storefront_footer_text_color', 'settings' => 'storefront_footer_text_color',
@ -430,7 +471,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Footer link color * Footer link color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_footer_link_color', array( 'storefront_footer_link_color',
array(
'default' => apply_filters( 'storefront_default_footer_link_color', '#2c2d33' ), 'default' => apply_filters( 'storefront_default_footer_link_color', '#2c2d33' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -438,7 +480,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_footer_link_color', array( $wp_customize,
'storefront_footer_link_color',
array(
'label' => __( 'Link color', 'storefront' ), 'label' => __( 'Link color', 'storefront' ),
'section' => 'storefront_footer', 'section' => 'storefront_footer',
'settings' => 'storefront_footer_link_color', 'settings' => 'storefront_footer_link_color',
@ -451,7 +495,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Buttons section * Buttons section
*/ */
$wp_customize->add_section( $wp_customize->add_section(
'storefront_buttons', array( 'storefront_buttons',
array(
'title' => __( 'Buttons', 'storefront' ), 'title' => __( 'Buttons', 'storefront' ),
'priority' => 45, 'priority' => 45,
'description' => __( 'Customize the look & feel of your website buttons.', 'storefront' ), 'description' => __( 'Customize the look & feel of your website buttons.', 'storefront' ),
@ -462,7 +507,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Button background color * Button background color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_button_background_color', array( 'storefront_button_background_color',
array(
'default' => apply_filters( 'storefront_default_button_background_color', '#96588a' ), 'default' => apply_filters( 'storefront_default_button_background_color', '#96588a' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -470,7 +516,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_button_background_color', array( $wp_customize,
'storefront_button_background_color',
array(
'label' => __( 'Background color', 'storefront' ), 'label' => __( 'Background color', 'storefront' ),
'section' => 'storefront_buttons', 'section' => 'storefront_buttons',
'settings' => 'storefront_button_background_color', 'settings' => 'storefront_button_background_color',
@ -483,7 +531,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Button text color * Button text color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_button_text_color', array( 'storefront_button_text_color',
array(
'default' => apply_filters( 'storefront_default_button_text_color', '#ffffff' ), 'default' => apply_filters( 'storefront_default_button_text_color', '#ffffff' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -491,7 +540,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_button_text_color', array( $wp_customize,
'storefront_button_text_color',
array(
'label' => __( 'Text color', 'storefront' ), 'label' => __( 'Text color', 'storefront' ),
'section' => 'storefront_buttons', 'section' => 'storefront_buttons',
'settings' => 'storefront_button_text_color', 'settings' => 'storefront_button_text_color',
@ -504,7 +555,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Button alt background color * Button alt background color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_button_alt_background_color', array( 'storefront_button_alt_background_color',
array(
'default' => apply_filters( 'storefront_default_button_alt_background_color', '#2c2d33' ), 'default' => apply_filters( 'storefront_default_button_alt_background_color', '#2c2d33' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -512,7 +564,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_button_alt_background_color', array( $wp_customize,
'storefront_button_alt_background_color',
array(
'label' => __( 'Alternate button background color', 'storefront' ), 'label' => __( 'Alternate button background color', 'storefront' ),
'section' => 'storefront_buttons', 'section' => 'storefront_buttons',
'settings' => 'storefront_button_alt_background_color', 'settings' => 'storefront_button_alt_background_color',
@ -525,7 +579,8 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Button alt text color * Button alt text color
*/ */
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_button_alt_text_color', array( 'storefront_button_alt_text_color',
array(
'default' => apply_filters( 'storefront_default_button_alt_text_color', '#ffffff' ), 'default' => apply_filters( 'storefront_default_button_alt_text_color', '#ffffff' ),
'sanitize_callback' => 'sanitize_hex_color', 'sanitize_callback' => 'sanitize_hex_color',
) )
@ -533,7 +588,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new WP_Customize_Color_Control( new WP_Customize_Color_Control(
$wp_customize, 'storefront_button_alt_text_color', array( $wp_customize,
'storefront_button_alt_text_color',
array(
'label' => __( 'Alternate button text color', 'storefront' ), 'label' => __( 'Alternate button text color', 'storefront' ),
'section' => 'storefront_buttons', 'section' => 'storefront_buttons',
'settings' => 'storefront_button_alt_text_color', 'settings' => 'storefront_button_alt_text_color',
@ -546,14 +603,16 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
* Layout * Layout
*/ */
$wp_customize->add_section( $wp_customize->add_section(
'storefront_layout', array( 'storefront_layout',
array(
'title' => __( 'Layout', 'storefront' ), 'title' => __( 'Layout', 'storefront' ),
'priority' => 50, 'priority' => 50,
) )
); );
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_layout', array( 'storefront_layout',
array(
'default' => apply_filters( 'storefront_default_layout', $layout = is_rtl() ? 'left' : 'right' ), 'default' => apply_filters( 'storefront_default_layout', $layout = is_rtl() ? 'left' : 'right' ),
'sanitize_callback' => 'storefront_sanitize_choices', 'sanitize_callback' => 'storefront_sanitize_choices',
) )
@ -561,7 +620,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new Storefront_Custom_Radio_Image_Control( new Storefront_Custom_Radio_Image_Control(
$wp_customize, 'storefront_layout', array( $wp_customize,
'storefront_layout',
array(
'settings' => 'storefront_layout', 'settings' => 'storefront_layout',
'section' => 'storefront_layout', 'section' => 'storefront_layout',
'label' => __( 'General Layout', 'storefront' ), 'label' => __( 'General Layout', 'storefront' ),
@ -579,14 +640,16 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
*/ */
if ( apply_filters( 'storefront_customizer_more', true ) ) { if ( apply_filters( 'storefront_customizer_more', true ) ) {
$wp_customize->add_section( $wp_customize->add_section(
'storefront_more', array( 'storefront_more',
array(
'title' => __( 'More', 'storefront' ), 'title' => __( 'More', 'storefront' ),
'priority' => 999, 'priority' => 999,
) )
); );
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_more', array( 'storefront_more',
array(
'default' => null, 'default' => null,
'sanitize_callback' => 'sanitize_text_field', 'sanitize_callback' => 'sanitize_text_field',
) )
@ -594,7 +657,9 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
$wp_customize->add_control( $wp_customize->add_control(
new More_Storefront_Control( new More_Storefront_Control(
$wp_customize, 'storefront_more', array( $wp_customize,
'storefront_more',
array(
'label' => __( 'Looking for more options?', 'storefront' ), 'label' => __( 'Looking for more options?', 'storefront' ),
'section' => 'storefront_more', 'section' => 'storefront_more',
'settings' => 'storefront_more', 'settings' => 'storefront_more',

6
inc/jetpack/class-storefront-jetpack.php
View file

@ -37,8 +37,10 @@ if ( ! class_exists( 'Storefront_Jetpack' ) ) :
*/ */
public function jetpack_setup() { public function jetpack_setup() {
add_theme_support( add_theme_support(
'infinite-scroll', apply_filters( 'infinite-scroll',
'storefront_jetpack_infinite_scroll_args', array( apply_filters(
'storefront_jetpack_infinite_scroll_args',
array(
'container' => 'main', 'container' => 'main',
'footer' => 'page', 'footer' => 'page',
'render' => array( $this, 'jetpack_infinite_scroll_loop' ), 'render' => array( $this, 'jetpack_infinite_scroll_loop' ),

3
inc/nux/class-storefront-nux-admin.php
View file

@ -211,7 +211,8 @@ if ( ! class_exists( 'Storefront_NUX_Admin' ) ) :
$woocommerce_pages = array(); $woocommerce_pages = array();
$wc_pages_options = apply_filters( $wc_pages_options = apply_filters(
'storefront_page_option_names', array( 'storefront_page_option_names',
array(
'woocommerce_cart_page_id', 'woocommerce_cart_page_id',
'woocommerce_checkout_page_id', 'woocommerce_checkout_page_id',
'woocommerce_myaccount_page_id', 'woocommerce_myaccount_page_id',

6
inc/nux/class-storefront-nux-starter-content.php
View file

@ -466,7 +466,8 @@ if ( ! class_exists( 'Storefront_NUX_Starter_Content' ) ) :
// Get empty categories. // Get empty categories.
$categories = get_terms( $categories = get_terms(
'product_cat', array( 'product_cat',
array(
'hide_empty' => false, 'hide_empty' => false,
) )
); );
@ -642,7 +643,8 @@ if ( ! class_exists( 'Storefront_NUX_Starter_Content' ) ) :
public function filter_sf_categories( $args ) { public function filter_sf_categories( $args ) {
// Get Categories. // Get Categories.
$product_cats = get_terms( $product_cats = get_terms(
'product_cat', array( 'product_cat',
array(
'fields' => 'ids', 'fields' => 'ids',
'hide_empty' => false, 'hide_empty' => false,
) )

2
inc/storefront-functions.php
View file

@ -153,7 +153,7 @@ function get_rgb_values_from_hex( $hex ) {
* @since 2.5.8 * @since 2.5.8
*/ */
function is_color_light( $hex ) { function is_color_light( $hex ) {
$rgb_values = get_rgb_values_from_hex( $hex ); $rgb_values = get_rgb_values_from_hex( $hex );
$average_lightness = ( $rgb_values['r'] + $rgb_values['g'] + $rgb_values['b'] ) / 3; $average_lightness = ( $rgb_values['r'] + $rgb_values['g'] + $rgb_values['b'] ) / 3;
return $average_lightness >= 127.5; return $average_lightness >= 127.5;
} }

14
inc/storefront-template-functions.php
View file

@ -50,7 +50,7 @@ if ( ! function_exists( 'storefront_comment' ) ) {
<?php endif; ?> <?php endif; ?>
<a href="<?php echo esc_url( htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ); ?>" class="comment-date"> <a href="<?php echo esc_url( htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ); ?>" class="comment-date">
<?php echo '<time datetime="' . get_comment_date( 'c' ) . '">' . get_comment_date() . '</time>'; ?> <?php echo '<time datetime="' . esc_html( get_comment_date( 'c' ) ) . '">' . esc_html( get_comment_date() ) . '</time>'; ?>
</a> </a>
</div> </div>
<?php if ( 'div' !== $args['style'] ) : ?> <?php if ( 'div' !== $args['style'] ) : ?>
@ -63,7 +63,8 @@ if ( ! function_exists( 'storefront_comment' ) ) {
<?php <?php
comment_reply_link( comment_reply_link(
array_merge( array_merge(
$args, array( $args,
array(
'add_below' => $add_below, 'add_below' => $add_below,
'depth' => $depth, 'depth' => $depth,
'max_depth' => $args['max_depth'], 'max_depth' => $args['max_depth'],
@ -145,14 +146,14 @@ if ( ! function_exists( 'storefront_credit' ) ) {
} }
if ( apply_filters( 'storefront_privacy_policy_link', true ) && function_exists( 'the_privacy_policy_link' ) ) { if ( apply_filters( 'storefront_privacy_policy_link', true ) && function_exists( 'the_privacy_policy_link' ) ) {
$separator = '<span role="separator" aria-hidden="true"></span>'; $separator = '<span role="separator" aria-hidden="true"></span>';
$links_output = get_the_privacy_policy_link( '', ( ! empty( $links_output ) ? $separator : '' ) ) . $links_output; $links_output = get_the_privacy_policy_link( '', ( ! empty( $links_output ) ? $separator : '' ) ) . $links_output;
} }
$links_output = apply_filters( 'storefront_credit_links_output', $links_output ); $links_output = apply_filters( 'storefront_credit_links_output', $links_output );
?> ?>
<div class="site-info"> <div class="site-info">
<?php echo esc_html( apply_filters( 'storefront_copyright_text', $content = '&copy; ' . get_bloginfo( 'name' ) . ' ' . date( 'Y' ) ) ); ?> <?php echo esc_html( apply_filters( 'storefront_copyright_text', $content = '&copy; ' . get_bloginfo( 'name' ) . ' ' . gmdate( 'Y' ) ) ); ?>
<?php if ( ! empty( $links_output ) ) { ?> <?php if ( ! empty( $links_output ) ) { ?>
<br /> <br />
@ -224,7 +225,7 @@ if ( ! function_exists( 'storefront_site_title_or_logo' ) ) {
return $html; return $html;
} }
echo $html; // WPCS: XSS ok. echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
} }
} }
@ -489,7 +490,8 @@ if ( ! function_exists( 'storefront_post_meta' ) ) {
} }
echo wp_kses( echo wp_kses(
sprintf( '%1$s %2$s %3$s', $posted_on, $author, $comments ), array( sprintf( '%1$s %2$s %3$s', $posted_on, $author, $comments ),
array(
'span' => array( 'span' => array(
'class' => array(), 'class' => array(),
), ),

4
inc/woocommerce/class-storefront-woocommerce-adjacent-products.php
View file

@ -79,7 +79,7 @@ if ( ! class_exists( 'Storefront_WooCommerce_Adjacent_Products' ) ) :
public function get_product() { public function get_product() {
global $post; global $post;
$product = false; $product = false;
$this->current_product = $post->ID; $this->current_product = $post->ID;
// Try to get a valid product via `get_adjacent_post()`. // Try to get a valid product via `get_adjacent_post()`.
@ -163,7 +163,7 @@ if ( ! class_exists( 'Storefront_WooCommerce_Adjacent_Products' ) ) :
'visibility' => 'catalog', 'visibility' => 'catalog',
'exclude' => array( $post->ID ), 'exclude' => array( $post->ID ),
'orderby' => 'date', 'orderby' => 'date',
'status' => 'publish' 'status' => 'publish',
); );
if ( ! $this->previous ) { if ( ! $this->previous ) {

15
inc/woocommerce/class-storefront-woocommerce-customizer.php
View file

@ -55,7 +55,8 @@ if ( ! class_exists( 'Storefront_WooCommerce_Customizer' ) ) :
* Product Page * Product Page
*/ */
$wp_customize->add_section( $wp_customize->add_section(
'storefront_single_product_page', array( 'storefront_single_product_page',
array(
'title' => __( 'Product Page', 'storefront' ), 'title' => __( 'Product Page', 'storefront' ),
'priority' => 10, 'priority' => 10,
'panel' => 'woocommerce', 'panel' => 'woocommerce',
@ -63,21 +64,24 @@ if ( ! class_exists( 'Storefront_WooCommerce_Customizer' ) ) :
); );
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_product_pagination', array( 'storefront_product_pagination',
array(
'default' => apply_filters( 'storefront_default_product_pagination', true ), 'default' => apply_filters( 'storefront_default_product_pagination', true ),
'sanitize_callback' => 'wp_validate_boolean', 'sanitize_callback' => 'wp_validate_boolean',
) )
); );
$wp_customize->add_setting( $wp_customize->add_setting(
'storefront_sticky_add_to_cart', array( 'storefront_sticky_add_to_cart',
array(
'default' => apply_filters( 'storefront_default_sticky_add_to_cart', true ), 'default' => apply_filters( 'storefront_default_sticky_add_to_cart', true ),
'sanitize_callback' => 'wp_validate_boolean', 'sanitize_callback' => 'wp_validate_boolean',
) )
); );
$wp_customize->add_control( $wp_customize->add_control(
'storefront_sticky_add_to_cart', array( 'storefront_sticky_add_to_cart',
array(
'type' => 'checkbox', 'type' => 'checkbox',
'section' => 'storefront_single_product_page', 'section' => 'storefront_single_product_page',
'label' => __( 'Sticky Add-To-Cart', 'storefront' ), 'label' => __( 'Sticky Add-To-Cart', 'storefront' ),
@ -87,7 +91,8 @@ if ( ! class_exists( 'Storefront_WooCommerce_Customizer' ) ) :
); );
$wp_customize->add_control( $wp_customize->add_control(
'storefront_product_pagination', array( 'storefront_product_pagination',
array(
'type' => 'checkbox', 'type' => 'checkbox',
'section' => 'storefront_single_product_page', 'section' => 'storefront_single_product_page',
'label' => __( 'Product Pagination', 'storefront' ), 'label' => __( 'Product Pagination', 'storefront' ),

9
inc/woocommerce/class-storefront-woocommerce.php
View file

@ -57,8 +57,10 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
*/ */
public function setup() { public function setup() {
add_theme_support( add_theme_support(
'woocommerce', apply_filters( 'woocommerce',
'storefront_woocommerce_args', array( apply_filters(
'storefront_woocommerce_args',
array(
'single_image_width' => 416, 'single_image_width' => 416,
'thumbnail_image_width' => 324, 'thumbnail_image_width' => 324,
'product_grid' => array( 'product_grid' => array(
@ -183,7 +185,8 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
*/ */
public function related_products_args( $args ) { public function related_products_args( $args ) {
$args = apply_filters( $args = apply_filters(
'storefront_related_products_args', array( 'storefront_related_products_args',
array(
'posts_per_page' => 3, 'posts_per_page' => 3,
'columns' => 3, 'columns' => 3,
) )

106
inc/woocommerce/storefront-woocommerce-template-functions.php
View file

@ -267,7 +267,8 @@ if ( ! function_exists( 'storefront_product_categories' ) ) {
*/ */
function storefront_product_categories( $args ) { function storefront_product_categories( $args ) {
$args = apply_filters( $args = apply_filters(
'storefront_product_categories_args', array( 'storefront_product_categories_args',
array(
'limit' => 3, 'limit' => 3,
'columns' => 3, 'columns' => 3,
'child_categories' => 0, 'child_categories' => 0,
@ -277,8 +278,10 @@ if ( ! function_exists( 'storefront_product_categories' ) ) {
); );
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'product_categories', apply_filters( 'product_categories',
'storefront_product_categories_shortcode_args', array( apply_filters(
'storefront_product_categories_shortcode_args',
array(
'number' => intval( $args['limit'] ), 'number' => intval( $args['limit'] ),
'columns' => intval( $args['columns'] ), 'columns' => intval( $args['columns'] ),
'orderby' => esc_attr( $args['orderby'] ), 'orderby' => esc_attr( $args['orderby'] ),
@ -299,7 +302,7 @@ if ( ! function_exists( 'storefront_product_categories' ) ) {
do_action( 'storefront_homepage_after_product_categories_title' ); do_action( 'storefront_homepage_after_product_categories_title' );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
do_action( 'storefront_homepage_after_product_categories' ); do_action( 'storefront_homepage_after_product_categories' );
@ -319,7 +322,8 @@ if ( ! function_exists( 'storefront_recent_products' ) ) {
*/ */
function storefront_recent_products( $args ) { function storefront_recent_products( $args ) {
$args = apply_filters( $args = apply_filters(
'storefront_recent_products_args', array( 'storefront_recent_products_args',
array(
'limit' => 4, 'limit' => 4,
'columns' => 4, 'columns' => 4,
'orderby' => 'date', 'orderby' => 'date',
@ -329,8 +333,10 @@ if ( ! function_exists( 'storefront_recent_products' ) ) {
); );
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'products', apply_filters( 'products',
'storefront_recent_products_shortcode_args', array( apply_filters(
'storefront_recent_products_shortcode_args',
array(
'orderby' => esc_attr( $args['orderby'] ), 'orderby' => esc_attr( $args['orderby'] ),
'order' => esc_attr( $args['order'] ), 'order' => esc_attr( $args['order'] ),
'per_page' => intval( $args['limit'] ), 'per_page' => intval( $args['limit'] ),
@ -351,7 +357,7 @@ if ( ! function_exists( 'storefront_recent_products' ) ) {
do_action( 'storefront_homepage_after_recent_products_title' ); do_action( 'storefront_homepage_after_recent_products_title' );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
do_action( 'storefront_homepage_after_recent_products' ); do_action( 'storefront_homepage_after_recent_products' );
@ -371,7 +377,8 @@ if ( ! function_exists( 'storefront_featured_products' ) ) {
*/ */
function storefront_featured_products( $args ) { function storefront_featured_products( $args ) {
$args = apply_filters( $args = apply_filters(
'storefront_featured_products_args', array( 'storefront_featured_products_args',
array(
'limit' => 4, 'limit' => 4,
'columns' => 4, 'columns' => 4,
'orderby' => 'date', 'orderby' => 'date',
@ -382,8 +389,10 @@ if ( ! function_exists( 'storefront_featured_products' ) ) {
); );
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'products', apply_filters( 'products',
'storefront_featured_products_shortcode_args', array( apply_filters(
'storefront_featured_products_shortcode_args',
array(
'per_page' => intval( $args['limit'] ), 'per_page' => intval( $args['limit'] ),
'columns' => intval( $args['columns'] ), 'columns' => intval( $args['columns'] ),
'orderby' => esc_attr( $args['orderby'] ), 'orderby' => esc_attr( $args['orderby'] ),
@ -405,7 +414,7 @@ if ( ! function_exists( 'storefront_featured_products' ) ) {
do_action( 'storefront_homepage_after_featured_products_title' ); do_action( 'storefront_homepage_after_featured_products_title' );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
do_action( 'storefront_homepage_after_featured_products' ); do_action( 'storefront_homepage_after_featured_products' );
@ -425,7 +434,8 @@ if ( ! function_exists( 'storefront_popular_products' ) ) {
*/ */
function storefront_popular_products( $args ) { function storefront_popular_products( $args ) {
$args = apply_filters( $args = apply_filters(
'storefront_popular_products_args', array( 'storefront_popular_products_args',
array(
'limit' => 4, 'limit' => 4,
'columns' => 4, 'columns' => 4,
'orderby' => 'rating', 'orderby' => 'rating',
@ -435,8 +445,10 @@ if ( ! function_exists( 'storefront_popular_products' ) ) {
); );
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'products', apply_filters( 'products',
'storefront_popular_products_shortcode_args', array( apply_filters(
'storefront_popular_products_shortcode_args',
array(
'per_page' => intval( $args['limit'] ), 'per_page' => intval( $args['limit'] ),
'columns' => intval( $args['columns'] ), 'columns' => intval( $args['columns'] ),
'orderby' => esc_attr( $args['orderby'] ), 'orderby' => esc_attr( $args['orderby'] ),
@ -457,7 +469,7 @@ if ( ! function_exists( 'storefront_popular_products' ) ) {
do_action( 'storefront_homepage_after_popular_products_title' ); do_action( 'storefront_homepage_after_popular_products_title' );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
do_action( 'storefront_homepage_after_popular_products' ); do_action( 'storefront_homepage_after_popular_products' );
@ -477,7 +489,8 @@ if ( ! function_exists( 'storefront_on_sale_products' ) ) {
*/ */
function storefront_on_sale_products( $args ) { function storefront_on_sale_products( $args ) {
$args = apply_filters( $args = apply_filters(
'storefront_on_sale_products_args', array( 'storefront_on_sale_products_args',
array(
'limit' => 4, 'limit' => 4,
'columns' => 4, 'columns' => 4,
'orderby' => 'date', 'orderby' => 'date',
@ -488,8 +501,10 @@ if ( ! function_exists( 'storefront_on_sale_products' ) ) {
); );
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'products', apply_filters( 'products',
'storefront_on_sale_products_shortcode_args', array( apply_filters(
'storefront_on_sale_products_shortcode_args',
array(
'per_page' => intval( $args['limit'] ), 'per_page' => intval( $args['limit'] ),
'columns' => intval( $args['columns'] ), 'columns' => intval( $args['columns'] ),
'orderby' => esc_attr( $args['orderby'] ), 'orderby' => esc_attr( $args['orderby'] ),
@ -511,7 +526,7 @@ if ( ! function_exists( 'storefront_on_sale_products' ) ) {
do_action( 'storefront_homepage_after_on_sale_products_title' ); do_action( 'storefront_homepage_after_on_sale_products_title' );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
do_action( 'storefront_homepage_after_on_sale_products' ); do_action( 'storefront_homepage_after_on_sale_products' );
@ -531,7 +546,8 @@ if ( ! function_exists( 'storefront_best_selling_products' ) ) {
*/ */
function storefront_best_selling_products( $args ) { function storefront_best_selling_products( $args ) {
$args = apply_filters( $args = apply_filters(
'storefront_best_selling_products_args', array( 'storefront_best_selling_products_args',
array(
'limit' => 4, 'limit' => 4,
'columns' => 4, 'columns' => 4,
'orderby' => 'popularity', 'orderby' => 'popularity',
@ -541,8 +557,10 @@ if ( ! function_exists( 'storefront_best_selling_products' ) ) {
); );
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'products', apply_filters( 'products',
'storefront_best_selling_products_shortcode_args', array( apply_filters(
'storefront_best_selling_products_shortcode_args',
array(
'per_page' => intval( $args['limit'] ), 'per_page' => intval( $args['limit'] ),
'columns' => intval( $args['columns'] ), 'columns' => intval( $args['columns'] ),
'orderby' => esc_attr( $args['orderby'] ), 'orderby' => esc_attr( $args['orderby'] ),
@ -563,7 +581,7 @@ if ( ! function_exists( 'storefront_best_selling_products' ) ) {
do_action( 'storefront_homepage_after_best_selling_products_title' ); do_action( 'storefront_homepage_after_best_selling_products_title' );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
do_action( 'storefront_homepage_after_best_selling_products' ); do_action( 'storefront_homepage_after_best_selling_products' );
@ -595,32 +613,41 @@ if ( ! function_exists( 'storefront_promoted_products' ) ) {
echo '<h2>' . esc_html__( 'Featured Products', 'storefront' ) . '</h2>'; echo '<h2>' . esc_html__( 'Featured Products', 'storefront' ) . '</h2>';
// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
echo storefront_do_shortcode( echo storefront_do_shortcode(
'featured_products', array( 'featured_products',
array(
'per_page' => $per_page, 'per_page' => $per_page,
'columns' => $columns, 'columns' => $columns,
) )
); // WPCS: XSS ok. );
// phpcs:enable
} elseif ( wc_get_product_ids_on_sale() ) { } elseif ( wc_get_product_ids_on_sale() ) {
echo '<h2>' . esc_html__( 'On Sale Now', 'storefront' ) . '</h2>'; echo '<h2>' . esc_html__( 'On Sale Now', 'storefront' ) . '</h2>';
// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
echo storefront_do_shortcode( echo storefront_do_shortcode(
'sale_products', array( 'sale_products',
array(
'per_page' => $per_page, 'per_page' => $per_page,
'columns' => $columns, 'columns' => $columns,
) )
); // WPCS: XSS ok. );
// phpcs:enable
} elseif ( $recent_fallback ) { } elseif ( $recent_fallback ) {
echo '<h2>' . esc_html__( 'New In Store', 'storefront' ) . '</h2>'; echo '<h2>' . esc_html__( 'New In Store', 'storefront' ) . '</h2>';
// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
echo storefront_do_shortcode( echo storefront_do_shortcode(
'recent_products', array( 'recent_products',
array(
'per_page' => $per_page, 'per_page' => $per_page,
'columns' => $columns, 'columns' => $columns,
) )
); // WPCS: XSS ok. );
// phpcs:enable
} }
} }
} }
@ -784,7 +811,7 @@ if ( ! function_exists( 'storefront_sticky_single_add_to_cart' ) ) {
if ( $product->is_purchasable() && $product->is_in_stock() ) { if ( $product->is_purchasable() && $product->is_in_stock() ) {
$show = true; $show = true;
} else if ( $product->is_type( 'external' ) ) { } elseif ( $product->is_type( 'external' ) ) {
$show = true; $show = true;
} }
@ -793,7 +820,8 @@ if ( ! function_exists( 'storefront_sticky_single_add_to_cart' ) ) {
} }
$params = apply_filters( $params = apply_filters(
'storefront_sticky_add_to_cart_params', array( 'storefront_sticky_add_to_cart_params',
array(
'trigger_class' => 'entry-summary', 'trigger_class' => 'entry-summary',
) )
); );
@ -837,7 +865,8 @@ if ( ! function_exists( 'storefront_woocommerce_brands_homepage_section' ) ) {
*/ */
function storefront_woocommerce_brands_homepage_section() { function storefront_woocommerce_brands_homepage_section() {
$args = apply_filters( $args = apply_filters(
'storefront_woocommerce_brands_args', array( 'storefront_woocommerce_brands_args',
array(
'number' => 6, 'number' => 6,
'columns' => 4, 'columns' => 4,
'orderby' => 'name', 'orderby' => 'name',
@ -847,8 +876,10 @@ if ( ! function_exists( 'storefront_woocommerce_brands_homepage_section' ) ) {
); );
$shortcode_content = storefront_do_shortcode( $shortcode_content = storefront_do_shortcode(
'product_brand_thumbnails', apply_filters( 'product_brand_thumbnails',
'storefront_woocommerce_brands_shortcode_args', array( apply_filters(
'storefront_woocommerce_brands_shortcode_args',
array(
'number' => absint( $args['number'] ), 'number' => absint( $args['number'] ),
'columns' => absint( $args['columns'] ), 'columns' => absint( $args['columns'] ),
'orderby' => esc_attr( $args['orderby'] ), 'orderby' => esc_attr( $args['orderby'] ),
@ -865,7 +896,7 @@ if ( ! function_exists( 'storefront_woocommerce_brands_homepage_section' ) ) {
do_action( 'storefront_homepage_after_woocommerce_brands_title' ); do_action( 'storefront_homepage_after_woocommerce_brands_title' );
echo $shortcode_content; // WPCS: XSS ok. echo $shortcode_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
do_action( 'storefront_homepage_after_woocommerce_brands' ); do_action( 'storefront_homepage_after_woocommerce_brands' );
@ -906,7 +937,8 @@ if ( ! function_exists( 'storefront_woocommerce_brands_single' ) ) {
*/ */
function storefront_woocommerce_brands_single() { function storefront_woocommerce_brands_single() {
$brand = storefront_do_shortcode( $brand = storefront_do_shortcode(
'product_brand', array( 'product_brand',
array(
'class' => '', 'class' => '',
) )
); );

20
inc/wordpress-shims.php
View file

@ -6,14 +6,14 @@
*/ */
if ( ! function_exists( 'wp_body_open' ) ) { if ( ! function_exists( 'wp_body_open' ) ) {
/** /**
* Adds backwards compatibility for wp_body_open() introduced with WordPress 5.2 * Adds backwards compatibility for wp_body_open() introduced with WordPress 5.2
* *
* @since 2.5.4 * @since 2.5.4
* @see https://developer.wordpress.org/reference/functions/wp_body_open/ * @see https://developer.wordpress.org/reference/functions/wp_body_open/
* @return void * @return void
*/ */
function wp_body_open() { function wp_body_open() {
do_action( 'wp_body_open' ); do_action( 'wp_body_open' );
} }
} }

2
package.json
View file

@ -12,6 +12,8 @@
"css": "grunt css", "css": "grunt css",
"watch": "grunt watch", "watch": "grunt watch",
"deploy": "grunt deploy", "deploy": "grunt deploy",
"lint:php": "composer run-script phpcs ./",
"lint:php:fix": "composer run-script phpcbf ./",
"e2e:start": "wp-env start", "e2e:start": "wp-env start",
"e2e:stop": "wp-env stop", "e2e:stop": "wp-env stop",
"e2e:destroy": "wp-env destroy", "e2e:destroy": "wp-env destroy",

32
phpcs.xml
View file

@ -6,12 +6,13 @@
<description>WooCommerce dev PHP_CodeSniffer ruleset.</description> <description>WooCommerce dev PHP_CodeSniffer ruleset.</description>
<!-- Exclude paths --> <!-- Exclude paths -->
<exclude-pattern>*/node_modules/*</exclude-pattern> <exclude-pattern>*/storefront/node_modules/*</exclude-pattern>
<exclude-pattern>*/vendor/*</exclude-pattern> <exclude-pattern>*/storefront/vendor/*</exclude-pattern>
<exclude-pattern>*/storefront/storefront/*</exclude-pattern>
<!-- Configs --> <!-- Configs -->
<config name="minimum_supported_wp_version" value="4.7" /> <config name="minimum_supported_wp_version" value="5.3" />
<config name="testVersion" value="5.2-"/> <config name="testVersion" value="5.6-"/>
<!-- Rules --> <!-- Rules -->
<rule ref="WooCommerce-Core" /> <rule ref="WooCommerce-Core" />
@ -20,28 +21,7 @@
<exclude name="PHPCompatibility.PHP.NewInterfaces.jsonserializableFound" /> <exclude name="PHPCompatibility.PHP.NewInterfaces.jsonserializableFound" />
<exclude name="PHPCompatibility.PHP.NewKeywords.t_namespaceFound" /> <exclude name="PHPCompatibility.PHP.NewKeywords.t_namespaceFound" />
</rule> </rule>
<rule ref="WordPress" />
<rule ref="WordPress">
<exclude name="WordPress.VIP.DirectDatabaseQuery.NoCaching" />
<exclude name="WordPress.VIP.DirectDatabaseQuery.DirectQuery" />
<exclude name="WordPress.VIP.DirectDatabaseQuery.SchemaChange" />
<exclude name="WordPress.VIP.FileSystemWritesDisallow.file_ops_fwrite" />
<exclude name="WordPress.VIP.OrderByRand" />
<exclude name="WordPress.VIP.RestrictedFunctions" />
<exclude name="WordPress.VIP.RestrictedVariables.user_meta__wpdb__usermeta" />
<exclude name="WordPress.VIP.PostsPerPage.posts_per_page_posts_per_page" />
<exclude name="WordPress.VIP.RestrictedVariables.cache_constraints___COOKIE" />
</rule>
<rule ref="WordPress.VIP.ValidatedSanitizedInput">
<properties>
<property name="customSanitizingFunctions" type="array" value="wc_clean,wc_sanitize_tooltip,wc_format_decimal,wc_stock_amount,wc_sanitize_permalink,wc_sanitize_textarea" />
</properties>
</rule>
<rule ref="WordPress.XSS.EscapeOutput">
<properties>
<property name="customEscapingFunctions" type="array" value="wc_help_tip,wc_sanitize_tooltip" />
</properties>
</rule>
<rule ref="WordPress.WP.I18n"> <rule ref="WordPress.WP.I18n">
<properties> <properties>
<property name="text_domain" type="array" value="storefront" /> <property name="text_domain" type="array" value="storefront" />