Problem/Motivation

It would be great to address the below minor PHPCS issues :

phpcs --standard=Drupal,DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md,yml flexi_style/

FILE: /var/www/web/themes/contrib/flexi_style/fonts/fontawesome/LICENSE.txt
---------------------------------------------------------------------------
FOUND 0 ERRORS AND 6 WARNINGS AFFECTING 6 LINES
---------------------------------------------------------------------------
 129 | WARNING | Line exceeds 80 characters; contains 81 characters
 130 | WARNING | Line exceeds 80 characters; contains 83 characters
 131 | WARNING | Line exceeds 80 characters; contains 83 characters
 138 | WARNING | Line exceeds 80 characters; contains 83 characters
 140 | WARNING | Line exceeds 80 characters; contains 82 characters
 141 | WARNING | Line exceeds 80 characters; contains 81 characters
---------------------------------------------------------------------------


FILE: /var/www/web/themes/contrib/flexi_style/theme-settings.php
------------------------------------------------------------------------------------
FOUND 0 ERRORS AND 3 WARNINGS AFFECTING 3 LINES
------------------------------------------------------------------------------------
 71 | WARNING | [x] A comma should follow the last multiline array item. Found: ]
 97 | WARNING | [ ] #options values usually have to run through t() for translation
 98 | WARNING | [ ] #options values usually have to run through t() for translation
------------------------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
------------------------------------------------------------------------------------


FILE: /var/www/web/themes/contrib/flexi_style/css/component/buttons.css
-----------------------------------------------------------------------
FOUND 1 ERROR AFFECTING 1 LINE
-----------------------------------------------------------------------
 91 | ERROR | [x] Multiple selectors should each be on a single line
-----------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
-----------------------------------------------------------------------


FILE: /var/www/web/themes/contrib/flexi_style/css/base/formating.css
----------------------------------------------------------------------
FOUND 1 ERROR AFFECTING 1 LINE
----------------------------------------------------------------------
 232 | ERROR | [x] Expected 1 newline at end of file; 0 found
----------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


FILE: /var/www/web/themes/contrib/flexi_style/css/base/elements.css
----------------------------------------------------------------------
FOUND 2 ERRORS AFFECTING 2 LINES
----------------------------------------------------------------------
   1 | ERROR | [x] Selectors must be on a single line
 380 | ERROR | [x] Expected 1 newline at end of file; 0 found
----------------------------------------------------------------------
PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


FILE: /var/www/web/themes/contrib/flexi_style/flexi_style.theme
---------------------------------------------------------------------------------------------------------------------------------
FOUND 3 ERRORS AFFECTING 2 LINES
---------------------------------------------------------------------------------------------------------------------------------
 8 | ERROR | [x] Line indented incorrectly; expected 0 spaces, found 1
 9 | ERROR | [x] Line indented incorrectly; expected 0 spaces, found 1
 9 | ERROR | [x] Use statements should be sorted alphabetically. The first wrong one is Drupal\Component\Render\MarkupInterface.
---------------------------------------------------------------------------------------------------------------------------------
PHPCBF CAN FIX THE 3 MARKED SNIFF VIOLATIONS AUTOMATICALLY
---------------------------------------------------------------------------------------------------------------------------------

Time: 2.69 secs; Memory: 60MB

Steps to reproduce

Run the command,
phpcs --standard=Drupal,DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md,yml flexi_style/

Proposed resolution

Fix the PHPCS issues.

Issue fork flexi_style-3498434

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

abhiyanshu created an issue. See original summary.

nidhish’s picture

nidhish commented
Assigned: Unassigned » nidhish

nidhish opened merge request !11

nidhish’s picture

nidhish commented
Status: Active » Needs review

@abhiyanshu Fixed the PHPCS issues

nidhish’s picture

nidhish commented
Assigned: nidhish » Unassigned
paraderojether’s picture

paraderojether commented
Status: Needs review » Needs work

Hi @nidhish,

I reviewed MR!11, applied against FlexiStyle 1.4.1, and there are still remaining phpcs issues show bellow: 

➜  flexi_style git:(main) ✗ curl https://git.drupalcode.org/project/flexi_style/-/merge_requests/11.diff | patch -p1
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  5209    0  5209    0     0  13844      0 --:--:-- --:--:-- --:--:-- 14040
patching file 'css/base/elements.css'
patching file 'css/base/formating.css'
patching file 'css/component/buttons.css'
patching file flexi_style.theme
patching file 'fonts/fontawesome/LICENSE.txt'
patching file theme-settings.php
➜  flexi_style git:(main) ✗ cd ..
➜  contrib git:(main) ✗ phpcs --standard=Drupal,DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md,yml,twig flexi_style

FILE: .../Q1/q1contributions/web/themes/contrib/flexi_style/css/component/field.css
--------------------------------------------------------------------------------
FOUND 1 ERROR AFFECTING 1 LINE
--------------------------------------------------------------------------------
 26 | ERROR | [x] Expected 1 newline at end of file; 0 found
--------------------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
--------------------------------------------------------------------------------


FILE: ...ions/web/themes/contrib/flexi_style/templates/form/input--submit.html.twig
--------------------------------------------------------------------------------
FOUND 1 ERROR AFFECTING 1 LINE
--------------------------------------------------------------------------------
 15 | ERROR | [x] Expected 1 newline at end of file; 0 found
--------------------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
--------------------------------------------------------------------------------

Time: 2.03 secs; Memory: 60MB

Command used: phpcs --standard=Drupal,DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md,yml,twig flexi_style

Please check and advise.
Thank you.

nidhish’s picture

nidhish commented
Assigned: Unassigned » nidhish
nidhish’s picture

nidhish commented

@paraderojether I have added the commit to fix the remaining issues. Kindly review and merge

nidhish’s picture

nidhish commented
Assigned: nidhish » Unassigned
Status: Needs work » Needs review
anoopsingh92’s picture

anoopsingh92
Location Rajasthan, India
commented
Status: Needs review » Needs work

Hi @nidhish,
Please check the Merge Request (MR). There are conflicts that need to be resolved. Also, ensure that you don't add files where no changes have been made.

nidhish closed merge request !11

nidhish reopened merge request !11

nidhish’s picture

nidhish commented

@anoopsingh92 Issue fork flexi_style-3498434 branch 1.4.x is not the same as flexi_style branch 1.4.x as the issue fork flexi_style-3498434 was created before the latest commit 3beb0e5b. Since, I do not have access to flexi_style, you or the maintainer of flexi_style have to resolve merge conflicts

nidhish’s picture

nidhish commented
Status: Needs work » Needs review
anoopsingh92’s picture

anoopsingh92
Location Rajasthan, India
commented
Status: Needs review » Needs work
nidhish’s picture

nidhish commented

@anoopsingh92 I have fixed the merged conflicts for MR11 : https://git.drupalcode.org/project/flexi_style/-/merge_requests/11.
Kindly review and merge.

nidhish’s picture

nidhish commented
Status: Needs work » Needs review
paraderojether’s picture

paraderojether commented

Hi nidhish,

I reviewed MR!11, again and it did not applied cleanly on my end. 

➜  flexi_style git:(1.4.1) curl https://git.drupalcode.org/project/flexi_style/-/merge_requests/11.diff | patch -p1
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  5945    0  5945    0     0  16466      0 --:--:-- --:--:-- --:--:-- 16841
patching file 'css/base/elements.css'
patching file 'css/base/formating.css'
patching file 'css/component/buttons.css'
patching file flexi_style.theme
1 out of 1 hunks failed--saving rejects to flexi_style.theme.rej
patching file 'fonts/fontawesome/LICENSE.txt'
patching file 'templates/form/input--submit.html.twig'
patching file theme-settings.php
➜  flexi_style git:(1.4.1) ✗

Kindly check and advise.
Thank you.

anoopsingh92’s picture

anoopsingh92
Location Rajasthan, India
commented
Status: Needs review » Needs work
nidhish’s picture

nidhish commented
Status: Needs work » Needs review

@anoopsingh92/ @paraderojether, I have removed changes in flexi_style.theme from this MR. Kindly review

anoopsingh92’s picture

anoopsingh92
Location Rajasthan, India
commented

anoopsingh92’s picture

anoopsingh92
Location Rajasthan, India
commented
Status: Needs review » Fixed

@all, Thanks for the contribution.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.