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.

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

Update modules major versions #862

Open
wants to merge 2 commits into
base: 8.0.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@
"drupal/field_group": "3.6",
"drupal/focal_point": "^2.1.2",
"drupal/facets": "^2.0.7",
"drupal/gin": "^3.0-rc15",
"drupal/gin_toolbar": "^1.0-rc6",
"drupal/gin": "^4.0",
"drupal/gin_toolbar": "^2.0",
"drupal/graphql": "^4.7",
"drupal/inline_entity_form": "^3.0.0-rc20",
"drupal/ivw_integration": "^2.0",
"drupal/length_indicator": "^1.2",
"drupal/linkit": "^7.0.0-alpha1",
"drupal/linkit": "^7.0.0",
"drupal/media_entity_instagram": "^4.0",
"drupal/media_entity_pinterest": "^2.7",
"drupal/media_entity_slideshow": "^2.0-alpha1",
"drupal/media_entity_slideshow": "^2.6",
"drupal/media_entity_twitter": "^2.5",
"drupal/media_expire": "^2.6",
"drupal/media_library_media_modify": "^2.0.0-beta1",
Expand All @@ -98,19 +98,17 @@
"drupal/scheduler_content_moderation_integration": "^3.0.1",
"drupal/schema_metatag": "^3.0.3",
"drupal/select2": "^2.0",
"drupal/search_api": "^1.36",
"drupal/search_api_mark_outdated": "^1.0",
"drupal/simple_sitemap": "^4.2.1",
"drupal/token": "^1.7",
"drupal/update_helper": "^2.0||^3.0.3||^4.0",
"drupal/search_api": "^1.36",
"drupal/update_helper": "^4.0",
"drupal/views_bulk_edit": "^3.0",
"drupal/views_bulk_operations": "^4.2.7",
"drupal/vgwort": "^3.0@beta",
"drupal/xymatic": "^1.0@beta",
"npm-asset/dropzone": "^5.5.1",
"npm-asset/exif-js": "^2.3.0",
"npm-asset/blazy": "^1.8",
"npm-asset/slick-carousel": "^1.8",
"npm-asset/select2": "dev-develop",
"caxy/php-htmldiff": "^0.1.14",
"webonyx/graphql-php": "^14.11.8"
Expand All @@ -132,7 +130,7 @@
"require-dev": {
"burdamagazinorg/thunder-dev-tools": "dev-master",
"thunder/thunder_testing_demo": "4.x-dev",
"mglaman/phpstan-drupal": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0"
"mglaman/phpstan-drupal": "^2.0",
"phpstan/phpstan-deprecation-rules": "^2.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public function testQueryCacheMetadata(): void {
* @param array $expectedResult
* The expected results.
*
* @covers EntitiesWithTerm::resolve
* @covers \Drupal\thunder_gqls\Plugin\GraphQL\DataProducer\EntitiesWithTerm::resolve
*
* @dataProvider providerEntityWithTerms
*/
Expand Down
8 changes: 4 additions & 4 deletions modules/thunder_workflow/src/ThunderWorkflowFormHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Drupal\Core\Url;
use Drupal\content_moderation\ModerationInformationInterface;
use Drupal\content_moderation\StateTransitionValidationInterface;
use Drupal\node\Entity\Node;
use Drupal\node\NodeInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
Expand Down Expand Up @@ -75,7 +76,7 @@ public static function create(ContainerInterface $container): self {
public function formAlter(array &$form, FormStateInterface $form_state): void {
/** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
$form_object = $form_state->getFormObject();
/** @var \Drupal\node\NodeInterface $entity */
/** @var \Drupal\node\Entity\Node $entity */
$entity = $form_object->getEntity();

if (!$this->moderationInfo->isModeratedEntity($entity)) {
Expand Down Expand Up @@ -164,11 +165,10 @@ public function moveStateToActions(NodeInterface $entity, array $form): array {
*
* @param array $form
* The form array.
* @param \Drupal\node\NodeInterface $entity
* @param \Drupal\node\Entity\Node $entity
* The node entity.
*/
public function displayPublishedinformation(array &$form, NodeInterface $entity): void {
/** @var \Drupal\node\Entity\Node $entity */
public function displayPublishedinformation(array &$form, Node $entity): void {
/** @var \Drupal\content_moderation\ContentModerationState $state */
$state = $this->moderationInfo->getWorkflowForEntity($entity)->getTypePlugin()->getState($entity->moderation_state->value);

Expand Down
1 change: 1 addition & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
parameters:
customRulesetUsed: true
reportUnmatchedIgnoredErrors: true
treatPhpDocTypesAsCertain: false
level: 6
ignoreErrors:
# new static() is a best practice in Drupal, so we cannot fix that.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class EntityReferenceActionsTest extends ThunderJavascriptTestBase {
*/
public function testMediaEditInArticle(): void {

/** @var \Drupal\node\Entity\Node $node */
$node = $this->loadNodeByUuid('36b2e2b2-3df0-43eb-a282-d792b0999c07');
$this->drupalGet($node->toUrl('edit-form'));

Expand Down
1 change: 0 additions & 1 deletion tests/src/FunctionalJavascript/MediaImageModifyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public function testRemoveAdd(): void {
$this->assertSession()
->elementNotExists('css', '[data-drupal-selector="edit-field-paragraphs-0-subform-field-image-wrapper"] div.messages--error');

/** @var \Drupal\media\Entity\Media $image2 */
$image2 = $this->loadMediaByUuid('a4b2fa51-8340-4982-b792-92e060b71eb9');
$this->selectMedia('field-paragraphs-0-subform-field-image', [$image2->id()]);

Expand Down
4 changes: 2 additions & 2 deletions tests/src/Traits/ThunderTestTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ protected function tearDown(): void {
* @param string $uuid
* The uuid.
*
* @return \Drupal\media\MediaInterface
* @return \Drupal\media\Entity\Media
* The media entity.
*
* @throws \Drupal\Core\Entity\EntityStorageException
Expand All @@ -193,7 +193,7 @@ protected function loadMediaByUuid(string $uuid): MediaInterface {
* @param string $uuid
* The uuid.
*
* @return \Drupal\node\NodeInterface
* @return \Drupal\node\Entity\Node
* The node entity.
*
* @throws \Drupal\Core\Entity\EntityStorageException
Expand Down
Loading