- Issue created by @abhiyanshu
- šµšPhilippines paraderojether
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. @paraderojether I have added the commit to fix the remaining issues. Kindly review and merge
- š®š³India anoopsingh92 Rajasthan, India
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. @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
@anoopsingh92 I have fixed the merged conflicts for MR11 : https://git.drupalcode.org/project/flexi_style/-/merge_requests/11.
Kindly review and merge.- šµšPhilippines paraderojether
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/ @paraderojether, I have removed changes in flexi_style.theme from this MR. Kindly review
-
anoopsingh92 ā
committed a9ffaa8d on 1.4.x authored by
nidhish ā
Issue #3498434: Fix issues reported by PHPCS
-
anoopsingh92 ā
committed a9ffaa8d on 1.4.x authored by
nidhish ā
- š®š³India anoopsingh92 Rajasthan, India
@all, Thanks for the contribution.
Automatically closed - issue fixed for 2 weeks with no activity.