Automatically closed - issue fixed for 2 weeks with no activity.
- 🇳🇿New Zealand quietone
The 'Overview' in the MR does not reflect the actual changes and it quite confusing. There were also truly unexpected errors on my part that I can't quite figure out how they happened. So, I started over and it turns out that this can now enable the sniff as well.
So, I am closing the parent as a duplicate, changing the title and moving credit.
- 🇳🇿New Zealand quietone
The child issue 📌 Fix remaining missing @var annotation that do not have a default value RTBC is small enough to fix the remaining violations and enable the sniff. So, I am closing this as a duplicate of that one and moving credit.
- 🇳🇿New Zealand quietone
I have thought about that but I also like that the changes are less when rebasing frequently.
Rebase and add more ignore lines.
- 🇮🇳India sourav_paul Kolkata
@avpaderno & @akulsaxena I've tested both MR!5 & MR!6 on the branch 1.0.x
MR!5 test result:
curl https://git.drupalcode.org/project/parameters/-/merge_requests/5.diff | git apply -v % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 48118 0 48118 0 0 70738 0 --:--:-- --:--:-- --:--:-- 70657 Checking patch .gitlab-ci.yml... Checking patch modules/parameters_ui/src/Controller/ParametersUiController.php... Checking patch modules/parameters_ui/src/Form/ParameterDeleteForm.php... Checking patch modules/parameters_ui/src/Form/ParameterForm.php... Checking patch modules/parameters_ui/src/Form/ParametersCollectionAddForm.php... Checking patch modules/parameters_ui/src/Form/ParametersCollectionForm.php... Hunk #4 succeeded at 165 (offset 7 lines). Hunk #5 succeeded at 239 (offset 7 lines). Hunk #6 succeeded at 404 (offset 7 lines). Checking patch modules/parameters_ui/src/Form/ParametersCollectionLockForm.php... Checking patch modules/parameters_ui/src/Form/ParametersCollectionUnlockForm.php... Checking patch modules/parameters_ui/src/ParametersUiListBuilder.php... Checking patch modules/parameters_ui/src/Routing/ParametersUiRouteEnhancer.php... Checking patch parameters.install... Checking patch parameters.module... Checking patch src/Entity/ParametersCollectionStorage.php... Checking patch src/EventSubscriber/ParametersConfigOverrideSubscriber.php... Checking patch src/Exception/ParameterNotFoundException.php... Checking patch src/Internals/ContentSerializationCompilerPass.php... Checking patch src/Internals/ItemSortTrait.php... Checking patch src/Normalizer/Legacy/ParametersContentEntityNormalizer.php... Checking patch src/Normalizer/ParametersContentEntityNormalizer.php... Checking patch src/Normalizer/ParametersEntityReferenceFieldItemNormalizer.php... Checking patch src/ParameterRepository.php... error: while searching for: use Drupal\parameters\Event\CollectionsPreparationEvent; use Drupal\parameters\Event\ParameterEvents; use Drupal\parameters\Exception\ParameterNotFoundException; use Drupal\parameters\Plugin\ParameterPluginCollection; use Drupal\parameters\Plugin\ParameterInterface; use Drupal\parameters\Plugin\ParameterManager; use Drupal\parameters\Plugin\PropertyParameterInterface; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; error: patch failed: src/ParameterRepository.php:10 error: src/ParameterRepository.php: patch does not apply Checking patch src/Plugin/Derivative/Parameter/ContentDeriver.php... Checking patch src/Plugin/Parameter/Bundles.php... Hunk #1 succeeded at 155 (offset 2 lines). Hunk #2 succeeded at 259 (offset 2 lines). Hunk #3 succeeded at 277 (offset 2 lines). Hunk #4 succeeded at 347 (offset 2 lines). Checking patch src/Plugin/Parameter/Content.php... error: while searching for: use Drupal\parameters\Entity\ParametersCollectionStorage; use Drupal\parameters\Internals\NormalizerContainer; use Drupal\parameters\Plugin\EntityParameterInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\parameters\Plugin\ParameterBase; use Drupal\parameters\Plugin\ParameterInterface; use Drupal\parameters\Plugin\ParameterManager; use Drupal\parameters\Plugin\PropertyParameterInterface; use Drupal\parameters\Plugin\UsageParameterInterface; use Symfony\Component\Serializer\Serializer; use Drupal\user\RoleInterface; use Drupal\user\UserInterface; /** * Defines content as parameter. error: patch failed: src/Plugin/Parameter/Content.php:31 error: src/Plugin/Parameter/Content.php: patch does not apply Checking patch src/Plugin/Parameter/Fields.php... Hunk #1 succeeded at 274 (offset 2 lines). Hunk #2 succeeded at 437 (offset 2 lines). Hunk #3 succeeded at 455 (offset 2 lines). Checking patch src/Plugin/Parameter/Http.php... Hunk #1 succeeded at 20 (offset 2 lines). Hunk #2 succeeded at 71 (offset 1 line). Hunk #3 succeeded at 103 (offset 1 line). Hunk #4 succeeded at 272 (offset 1 line). Hunk #5 succeeded at 293 (offset 1 line). Hunk #6 succeeded at 314 (offset 1 line). Hunk #7 succeeded at 326 (offset 1 line). Hunk #8 succeeded at 335 (offset 1 line). Hunk #9 succeeded at 348 (offset 1 line). Hunk #10 succeeded at 490 (offset 1 line). Hunk #11 succeeded at 626 (offset 1 line). Checking patch src/Plugin/Parameter/Increment.php... Hunk #1 succeeded at 27 (offset 1 line). Checking patch src/Plugin/Parameter/NullObject.php... Hunk #1 succeeded at 36 (offset 1 line). Checking patch src/Plugin/Parameter/Roles.php... Hunk #1 succeeded at 165 (offset 8 lines). Hunk #2 succeeded at 286 (offset 8 lines). Hunk #3 succeeded at 315 (offset 8 lines). Checking patch src/Plugin/Parameter/Types.php... Hunk #1 succeeded at 264 (offset 1 line). Checking patch src/Plugin/ParameterManager.php... error: while searching for: namespace Drupal\parameters\Plugin; use Drupal\Component\Plugin\PluginManagerInterface; use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Extension\ModuleHandlerInterface; /** * The manager for parameter plugins. error: patch failed: src/Plugin/ParameterManager.php:3 error: src/Plugin/ParameterManager.php: patch does not apply Checking patch tests/src/Kernel/ParametersTokenTest.php...MR!6 test result:
curl https://git.drupalcode.org/project/parameters/-/merge_requests/6.diff | git apply -v % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 52512 0 52512 0 0 63637 0 --:--:-- --:--:-- --:--:-- 63573 Checking patch .gitlab-ci.yml... Checking patch modules/parameters_ui/src/Controller/ParametersUiController.php... Checking patch modules/parameters_ui/src/Form/ParameterDeleteForm.php... Checking patch modules/parameters_ui/src/Form/ParameterForm.php... Checking patch modules/parameters_ui/src/Form/ParametersCollectionAddForm.php... Checking patch modules/parameters_ui/src/Form/ParametersCollectionForm.php... Hunk #4 succeeded at 165 (offset 7 lines). Hunk #5 succeeded at 239 (offset 7 lines). Hunk #6 succeeded at 404 (offset 7 lines). Checking patch modules/parameters_ui/src/Form/ParametersCollectionLockForm.php... Checking patch modules/parameters_ui/src/Form/ParametersCollectionUnlockForm.php... Checking patch modules/parameters_ui/src/ParametersUiListBuilder.php... Checking patch modules/parameters_ui/src/Routing/ParametersUiRouteEnhancer.php... Checking patch parameters.install... Checking patch src/Entity/ParametersCollectionStorage.php... Checking patch src/EventSubscriber/ParametersConfigOverrideSubscriber.php... Checking patch src/Exception/ParameterNotFoundException.php... Checking patch src/Internals/ContentSerializationCompilerPass.php... Checking patch src/Normalizer/Legacy/ParametersContentEntityNormalizer.php... Checking patch src/Normalizer/ParametersContentEntityNormalizer.php... Checking patch src/Normalizer/ParametersEntityReferenceFieldItemNormalizer.php... Checking patch src/ParameterRepository.php... error: while searching for: use Drupal\parameters\Event\CollectionsPreparationEvent; use Drupal\parameters\Event\ParameterEvents; use Drupal\parameters\Exception\ParameterNotFoundException; use Drupal\parameters\Plugin\ParameterPluginCollection; use Drupal\parameters\Plugin\ParameterInterface; use Drupal\parameters\Plugin\ParameterManager; use Drupal\parameters\Plugin\PropertyParameterInterface; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; error: patch failed: src/ParameterRepository.php:10 error: src/ParameterRepository.php: patch does not apply Checking patch src/Plugin/Derivative/Parameter/ContentDeriver.php... Checking patch src/Plugin/Parameter/Bundles.php... Hunk #2 succeeded at 155 (offset 11 lines). Hunk #3 succeeded at 259 (offset 11 lines). Hunk #4 succeeded at 277 (offset 11 lines). Checking patch src/Plugin/Parameter/Content.php... error: while searching for: use Drupal\parameters\Entity\ParametersCollectionStorage; use Drupal\parameters\Internals\NormalizerContainer; use Drupal\parameters\Plugin\EntityParameterInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\parameters\Plugin\ParameterBase; use Drupal\parameters\Plugin\ParameterInterface; use Drupal\parameters\Plugin\ParameterManager; use Drupal\parameters\Plugin\PropertyParameterInterface; use Drupal\parameters\Plugin\UsageParameterInterface; use Symfony\Component\Serializer\Serializer; use Drupal\user\RoleInterface; use Drupal\user\UserInterface; /** * Defines content as parameter. error: patch failed: src/Plugin/Parameter/Content.php:31 error: src/Plugin/Parameter/Content.php: patch does not apply Checking patch src/Plugin/Parameter/Fields.php... Hunk #2 succeeded at 274 (offset 10 lines). Hunk #3 succeeded at 437 (offset 10 lines). Hunk #4 succeeded at 455 (offset 10 lines). Checking patch src/Plugin/Parameter/Http.php... Hunk #2 succeeded at 20 (offset 2 lines). Hunk #3 succeeded at 71 (offset 1 line). Hunk #4 succeeded at 103 (offset 1 line). Hunk #5 succeeded at 272 (offset 1 line). Hunk #6 succeeded at 293 (offset 1 line). Hunk #7 succeeded at 314 (offset 1 line). Hunk #8 succeeded at 326 (offset 1 line). Hunk #9 succeeded at 335 (offset 1 line). Hunk #10 succeeded at 348 (offset 1 line). Hunk #11 succeeded at 490 (offset 1 line). Hunk #12 succeeded at 626 (offset 1 line). Checking patch src/Plugin/Parameter/Increment.php... Hunk #1 succeeded at 27 (offset 1 line). Checking patch src/Plugin/Parameter/NullObject.php... Hunk #1 succeeded at 36 (offset 1 line). Checking patch src/Plugin/Parameter/Roles.php... Hunk #2 succeeded at 165 (offset 17 lines). Checking patch src/Plugin/Parameter/Types.php... Checking patch src/Plugin/ParameterManager.php... error: while searching for: namespace Drupal\parameters\Plugin; use Drupal\Component\Plugin\PluginManagerInterface; use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Extension\ModuleHandlerInterface; /** * The manager for parameter plugins. error: patch failed: src/Plugin/ParameterManager.php:3 error: src/Plugin/ParameterManager.php: patch does not applyPlease have a look...
- 🇳🇿New Zealand quietone
Rebase with a conflict in core/modules/views_ui/admin.inc because of all the hook changes.
- 🇷🇺Russia zniki.ru
Thanks for review.
Merge conflict resolved.
Code style violation were implemented in different place, and not part of this issue.
Mark this as RTBC. - 🇺🇸United States yas California 🇺🇸
@all
I ran the Behat tests and looks good. I’ll merge the patch into
7.xand8.x; and close this issue as Fixed. - 🇺🇸United States yas California 🇺🇸
@akulsaxena
By the way, did you read the contributor guide?
https://www.drupal.org/community/contributor-guide/skill/software-testin... →
- 🇺🇸United States yas California 🇺🇸
@akulsaxena
No, it doesn't mean we can make this issue RTBC. PHPUnit tests are not enough in this case since the patch has so many changes.
We need to test the patch more carefully. I'm now testing the patch by running Behat.
- 🇮🇳India akulsaxena
PHPCS and PHPStan errors seem to have been taken care of and all the pipelines are now green.
Looks good to me
Also, no merge conflicts found. Can be merged
Can be moved to RTBC now - @yas opened merge request.
- Issue created by @yas
- 🇺🇸United States smustgrave
Needs manual rebase.
As mentioned there are a number of these floating around if you want to focus on one and ping that to me I'll prioritize it @quietone, so you don't have to keep rebasing a dozen of them.
Automatically closed - issue fixed for 2 weeks with no activity.
The Needs Review Queue Bot → tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".
This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.
Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.
The Needs Review Queue Bot → tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".
This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.
Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.
Automatically closed - issue fixed for 2 weeks with no activity.
Automatically closed - issue fixed for 2 weeks with no activity.
Hi all!
The issues have been fixed and the MR merged. Will be on the next release.
Thank you for you contributions!-
sovimi →
committed ee3afcb6 on 8.x-1.x authored by
avpaderno →
Issue #3362033: Fix the issues reported by phpcs
-
sovimi →
committed ee3afcb6 on 8.x-1.x authored by
avpaderno →
- 🇵🇹Portugal joaomarques736
Hello all,
It is already fixed in the new release 3.0.6.
Thanks!
- First commit to issue fork.
- 🇨🇦Canada Liam Morland Ontario, CA 🇨🇦
liam morland → made their first commit to this issue’s fork.
- 🇬🇧United Kingdom alexpott 🇪🇺🌍
This change confuses me because it's removing @var from stuff... also if I only apply the changes to the phpcs.xml.dist and run PHPCS the other error that's found is:
> phpcs --standard=core/phpcs.xml.dist --parallel="$( (nproc || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)" -- 'core' FILE: /Volumes/dev/drupal/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php ------------------------------------------------------------------------------------------- FOUND 1 ERROR AFFECTING 1 LINE ------------------------------------------------------------------------------------------- 37 | ERROR | Missing @var tag in member variable comment ------------------------------------------------------------------------------------------- Time: 26.72 secs; Memory: 12MBSo the rule changes are not covering the changes being made here.