Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update wpcs to 3.0 #43

Merged
merged 1 commit into from
Oct 15, 2023
+245 −28
Merged

Update wpcs to 3.0 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "t-hamano/richtext-extension",
"description": "WordPress plugin to add useful decoration features to the Gutenberg RichText editor toolbar.",
"description": "WordPress plugin to add useful decoration features to the Gutenberg RichText editor toolbar.",
"license": "GPL-2.0-or-later",
"authors": [
{
Expand All @@ -9,10 +9,10 @@
],
"require-dev": {
"squizlabs/php_codesniffer": "*",
"wp-coding-standards/wpcs": "*"
"wp-coding-standards/wpcs": "^3.0"
},
"scripts": {
"phpcs": "phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs",
"phpcs": "phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs,vendor/phpcsstandards/phpcsextra,vendor/phpcsstandards/phpcsutils",
"lint": "phpcs ./ --standard=./phpcs.ruleset.xml"
}
}
249 changes: 233 additions & 16 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions inc/class-config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Config {
/**
* Default highlighter variation
*/
static $highlighter = array(
public static $highlighter = array(
array(
'color' => '#ffff66',
'thickness' => 40,
Expand Down Expand Up @@ -41,5 +41,5 @@ class Config {
/**
* Default font size variation
*/
static $font_size = array( 80, 90, 130, 160 );
public static $font_size = array( 80, 90, 130, 160 );
}
4 changes: 2 additions & 2 deletions inc/class-enqueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Enqueue {
/**
* Constructor
*/
function __construct() {
public function __construct() {
// Enqueue front-end scripts
add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );

Expand Down Expand Up @@ -50,7 +50,7 @@ public function enqueue_editor_scripts() {

wp_add_inline_style( RTEX_NAMESPACE, $inline_css );

$asset = include( RTEX_PATH . '/build/index.asset.php' );
$asset = include RTEX_PATH . '/build/index.asset.php';
wp_enqueue_script( RTEX_NAMESPACE, RTEX_URL . '/build/index.js', $asset['dependencies'] );

wp_localize_script( RTEX_NAMESPACE, 'rtexConf', $this->create_editor_config() );
Expand Down
10 changes: 5 additions & 5 deletions inc/class-main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public function __construct() {
* Load classes
*/
private function load_classes() {
require_once( RTEX_PATH . '/inc/class-config.php' );
require_once( RTEX_PATH . '/inc/class-enqueue.php' );
require_once( RTEX_PATH . '/inc/class-options.php' );
require_once RTEX_PATH . '/inc/class-config.php';
require_once RTEX_PATH . '/inc/class-enqueue.php';
require_once RTEX_PATH . '/inc/class-options.php';
}

/**
Expand All @@ -46,15 +46,15 @@ public function add_action_links( $links ) {
public static function uninstall_richtext_extension() {
$options = array();

for ( $i = 0; $i <= 3; $i ++ ) {
for ( $i = 0; $i <= 3; $i++ ) {
$options[] = 'rtex_highlighter_active_' . $i;
$options[] = 'rtex_highlighter_title_' . $i;
$options[] = 'rtex_highlighter_color_' . $i;
$options[] = 'rtex_highlighter_thickness_' . $i;
$options[] = 'rtex_highlighter_opacity_' . $i;
}

for ( $i = 0; $i <= 3; $i ++ ) {
for ( $i = 0; $i <= 3; $i++ ) {
$options[] = 'rtex_font_size_active_' . $i;
$options[] = 'rtex_font_size_title_' . $i;
$options[] = 'rtex_font_size_size_' . $i;
Expand Down