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

Jump to bottom

2.x Fix some CS issues #2779

Merged
merged 3 commits into from
Jul 25, 2023
Merged

2.x Fix some CS issues #2779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40b44b2
Fix some CS issues
gchtr Jul 25, 2023
71357f6
Add CS fixes to ignored revs
gchtr Jul 25, 2023
ffe8fad
Run coding standard checks only with highest or stable dependencies
gchtr Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ f0216ce423bb133ce668774a5f75ca86455b7280

# Coding Style: some errors
3a19d4dabbe069fc0133b44f35f4c5e69026d744
40b44b28f6eae28a453a27a4358e5269097de598
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ jobs:
run: composer run lint

- name: Check CS
if: ${{ matrix.dependency-version == 'highest' || matrix.dependency-version == 'prefer-stable' }}
run: composer run cs

- name: Downgrade PHPUnit to ^7.5 when WP < 5.9
Expand Down
2 changes: 1 addition & 1 deletion src/Comment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ protected function avatar_default($default, $email, $size, $host)
}
if ('mystery' == $default) {
$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
} elseif ('blank' == $default) {
$default = $email ? 'blank' : includes_url('images/blank.gif');
} elseif (!empty($email) && 'gravatar_default' == $default) {
Expand Down
2 changes: 1 addition & 1 deletion src/Image/Operation/Resize.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public function run($load_filename, $save_filename)
Helper::error_log('Error resizing image');
Helper::error_log($result);
return false;
// @codeCoverageIgnoreEnd
// @codeCoverageIgnoreEnd
} else {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ImageHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ private static function _operate($src, $op, $force = false)
}

// -- the below methods are just used for unit testing the URL generation code
//
//
/**
* @internal
*/
Expand Down
5 changes: 0 additions & 5 deletions tests/test-timber-meta-deprecated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?php

use Timber\Comment;
use Timber\Integration\AcfIntegration;
use Timber\Post;
use Timber\Term;

use Timber\User;

/**
* Class TestTimberMeta
Expand Down