- Issue created by @ashutosh ahirwal
- Issue was unassigned.
- Status changed to Needs review
almost 2 years ago 11:41am 20 June 2023 - Status changed to RTBC
almost 2 years ago 10:59pm 20 June 2023 - šµšPhilippines paraderojether
Hi Ashutosh Ahirwal
I reviewed patch #2, applied against Mercury Layouts 2.0.x-dev, and confirmed it fixes the issues reported by phpcs.
I added screenshots for reference.
Thank You. - First commit to issue fork.
- Status changed to Needs work
7 months ago 2:17pm 11 September 2024 - š®š³India akulsaxena
Hi @pixelwhip and @justin2pin
I tried to solve the phpcs errors and solved all phpcs errors. but when i generated the mr and pushed it, it shows merge conflict. Can you please take a look into it. - šµšPhilippines clarkssquared
Hi
I applied MR !11 and I can still see many PHPCS issues that phpcs reported
ā mercury_layouts git:(2.0.x) curl https://git.drupalcode.org/project/mercury_layouts/-/merge_requests/11.diff | patch -p1 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 12054 0 12054 0 0 23397 0 --:--:-- --:--:-- --:--:-- 23681 patching file README.md patching file 'components/cluster/cluster.component.yml' patching file 'components/columns-2/columns-2.component.yml' patching file 'components/columns-3/columns-3.component.yml' patching file 'components/columns-4/columns-4.component.yml' patching file 'components/columns-5/columns-5.component.yml' patching file 'components/columns/columns.component.yml' patching file 'components/columns/columns.css' patching file 'components/container/container.component.yml' patching file 'components/container/container.stories.yml' patching file 'components/container/container.theme.css' patching file 'components/grid/grid.component.yml' patching file 'components/grid/grid.css' patching file 'components/grid/grid.stories.yml' patching file 'components/skeleton/skeleton.component.yml' patching file 'components/skeleton/skeleton.css' patching file 'components/stack/stack.component.yml' patching file 'components/stack/stack.layout.css' patching file 'components/stack/stack.stories.yml' patching file 'css/utilities.css' patching file 'src/Plugin/StyleOption/MercuryBoxSize.php' patching file 'src/Plugin/StyleOption/MercuryColumnRatio.php' ā mercury_layouts git:(2.0.x) ā .. ā contrib git:(main) ā phpcs --standard=Drupal,DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md,yml mercury_layouts FILE: ...upal-issues/drupal/drupal/web/modules/contrib/mercury_layouts/css/tabs.css -------------------------------------------------------------------------------- FOUND 11 ERRORS AFFECTING 11 LINES -------------------------------------------------------------------------------- 12 | ERROR | [x] Selectors must be on a single line 13 | ERROR | [x] Selectors must be on a single line 14 | ERROR | [x] Selectors must be on a single line 15 | ERROR | [x] Selectors must be on a single line 16 | ERROR | [x] Selectors must be on a single line 17 | ERROR | [x] Selectors must be on a single line 18 | ERROR | [x] Selectors must be on a single line 19 | ERROR | [x] Selectors must be on a single line 20 | ERROR | [ ] Style definitions must end with a semicolon 38 | ERROR | [x] Selectors must be on a single line 39 | ERROR | [ ] Style definitions must end with a semicolon -------------------------------------------------------------------------------- PHPCBF CAN FIX THE 9 MARKED SNIFF VIOLATIONS AUTOMATICALLY -------------------------------------------------------------------------------- FILE: ...-issues/drupal/drupal/web/modules/contrib/mercury_layouts/css/settings.css -------------------------------------------------------------------------------- FOUND 29 ERRORS AFFECTING 29 LINES -------------------------------------------------------------------------------- 3 | ERROR | Style definitions must end with a semicolon 4 | ERROR | Style definitions must end with a semicolon 5 | ERROR | Style definitions must end with a semicolon 6 | ERROR | Style definitions must end with a semicolon 7 | ERROR | Style definitions must end with a semicolon 8 | ERROR | Style definitions must end with a semicolon 9 | ERROR | Style definitions must end with a semicolon 10 | ERROR | Style definitions must end with a semicolon 11 | ERROR | Style definitions must end with a semicolon 12 | ERROR | Style definitions must end with a semicolon 13 | ERROR | Style definitions must end with a semicolon 14 | ERROR | Style definitions must end with a semicolon 15 | ERROR | Style definitions must end with a semicolon 16 | ERROR | Style definitions must end with a semicolon 17 | ERROR | Style definitions must end with a semicolon 23 | ERROR | Style definitions must end with a semicolon 24 | ERROR | Style definitions must end with a semicolon 25 | ERROR | Style definitions must end with a semicolon 26 | ERROR | Style definitions must end with a semicolon 27 | ERROR | Style definitions must end with a semicolon 28 | ERROR | Style definitions must end with a semicolon 29 | ERROR | Style definitions must end with a semicolon 30 | ERROR | Style definitions must end with a semicolon 31 | ERROR | Style definitions must end with a semicolon 32 | ERROR | Style definitions must end with a semicolon 33 | ERROR | Style definitions must end with a semicolon 34 | ERROR | Style definitions must end with a semicolon 35 | ERROR | Style definitions must end with a semicolon 36 | ERROR | Style definitions must end with a semicolon -------------------------------------------------------------------------------- FILE: ...upal/web/modules/contrib/mercury_layouts/css/dynamic-regions-editor-ui.css -------------------------------------------------------------------------------- FOUND 19 ERRORS AFFECTING 17 LINES -------------------------------------------------------------------------------- 15 | ERROR | [x] Selectors must be on a single line 16 | ERROR | [ ] Style definitions must end with a semicolon 40 | ERROR | [x] Selectors must be on a single line 41 | ERROR | [x] Selectors must be on a single line 42 | ERROR | [x] Selectors must be on a single line 43 | ERROR | [x] Selectors must be on a single line 44 | ERROR | [x] Selectors must be on a single line 45 | ERROR | [x] Selectors must be on a single line 46 | ERROR | [x] Expected 1 space after colon in style definition; 0 found 46 | ERROR | [ ] Style definitions must end with a semicolon 52 | ERROR | [x] Expected 1 space before opening brace of class definition; 2 | | found 57 | ERROR | [x] Selectors must be on a single line 58 | ERROR | [x] Selectors must be on a single line 59 | ERROR | [x] Selectors must be on a single line 60 | ERROR | [x] Selectors must be on a single line 61 | ERROR | [x] Selectors must be on a single line 62 | ERROR | [x] Selectors must be on a single line 63 | ERROR | [x] Expected 1 space after colon in style definition; 0 found 63 | ERROR | [ ] Style definitions must end with a semicolon -------------------------------------------------------------------------------- PHPCBF CAN FIX THE 16 MARKED SNIFF VIOLATIONS AUTOMATICALLY -------------------------------------------------------------------------------- FILE: ...contrib/mercury_layouts/mercury_layouts_incorrect_attach_library.patch.txt -------------------------------------------------------------------------------- FOUND 0 ERRORS AND 1 WARNING AFFECTING 1 LINE -------------------------------------------------------------------------------- 1 | WARNING | Line exceeds 80 characters; contains 86 characters -------------------------------------------------------------------------------- FILE: ...s/drupal/drupal/web/modules/contrib/mercury_layouts/mercury_layouts.module -------------------------------------------------------------------------------- FOUND 5 ERRORS AFFECTING 5 LINES -------------------------------------------------------------------------------- 1 | ERROR | [x] Missing file doc comment 6 | ERROR | [x] There must be one blank line after the last USE statement; 2 | | found; 12 | ERROR | [x] Expected 1 blank line before function; 2 found 54 | ERROR | [ ] Missing parameter type 57 | ERROR | [ ] Description for the @return value is missing -------------------------------------------------------------------------------- PHPCBF CAN FIX THE 3 MARKED SNIFF VIOLATIONS AUTOMATICALLY -------------------------------------------------------------------------------- FILE: ...pal/drupal/web/modules/contrib/mercury_layouts/mercury_layouts.routing.yml -------------------------------------------------------------------------------- FOUND 1 ERROR AFFECTING 1 LINE -------------------------------------------------------------------------------- 44 | ERROR | [x] Expected 1 newline at end of file; 2 found -------------------------------------------------------------------------------- PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY -------------------------------------------------------------------------------- FILE: ...les/contrib/mercury_layouts/src/Plugin/Layout/DynamicRegionsLayoutBase.php -------------------------------------------------------------------------------- FOUND 1 ERROR AFFECTING 1 LINE -------------------------------------------------------------------------------- 26 | ERROR | [x] Multi-line function declarations must have a trailing comma | | after the last parameter -------------------------------------------------------------------------------- PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY -------------------------------------------------------------------------------- FILE: ...trib/mercury_layouts/src/Controller/EditDynamicRegionsLayoutController.php -------------------------------------------------------------------------------- FOUND 2 ERRORS AFFECTING 2 LINES -------------------------------------------------------------------------------- 7 | ERROR | [x] Use statements should be sorted alphabetically. The first | | wrong one is Drupal\Core\Ajax\AjaxHelperTrait. 67 | ERROR | [x] Multi-line function declarations must have a trailing comma | | after the last parameter -------------------------------------------------------------------------------- PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY -------------------------------------------------------------------------------- Time: 452ms; Memory: 12MB ā contrib git:(main) ā
- š®š³India akulsaxena
Hi @clarkssquared
I worked on this branch '3367929-fix-the-issues' which was cut from the branch '2.0.x' of this issue fork. I solved all the errors as mentioned in the issue summary.
The errors you mentioned on applying the patch exist in the branch '2.0.x' of the source repository, which is 5 commits ahead of the '2.0.x' branch of this issue fork. The files you mentioned having errors don't even exist in the issue fork's branch. Please try applying the patch on the branch '2.0.x' of this issue fork and let me know if any errors are found.
A new issue can be created for the PHPCS errors on source Repo with a new updated fork.