Just a minor. Composer validate throws a warning.

martin@martin-XPS-13-9370 /var/www/html/d9.localhost/web/modules/contrib/token (8.x-1.x=) $ composer validate
./composer.json is valid, but with a few warnings
See https://getcomposer.org/doc/04-schema.md for details on the schema
License "GPL-2.0+" is a deprecated SPDX license identifier, use "GPL-2.0-or-later" instead
CommentFileSizeAuthor
#11 Screenshot from 2020-06-18 15-19-14.png16.04 KBpaulocs
#9 reroll-patch-3131054-9.patch369 bytesngkoutsaik
#2 token-deprecated_license_identifier-3131054-2.patch392 byteslolandese
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

lolandese created an issue. See original summary.

lolandese’s picture

lolandese CreditAttribution: lolandese at Cognizant Technology Solutions commented
Status: Active » Needs review
FileSize
token-deprecated_license_identifier-3131054-2.patch392 bytes

After applying the attached patch it is solved:

martin@martin-XPS-13-9370 /var/www/html/d9.localhost/web/modules/contrib/token (8.x-1.x *=) $ composer validate
./composer.json is valid
lolandese’s picture

lolandese CreditAttribution: lolandese at Cognizant Technology Solutions commented
Priority: Normal » Minor
ngkoutsaik’s picture

ngkoutsaik CreditAttribution: ngkoutsaik at Agiledrop - Your Trusted Drupal Teammates commented
Status: Needs review » Needs work

Hi,

thanks for the patch. I reviewed it and it works.

However, it does not apply cleanly. I had to use patch -p1 < failing.patch in order for it to apply.

lolandese’s picture

lolandese CreditAttribution: lolandese at Cognizant Technology Solutions commented

Use git apply instead:

martin@martin-XPS-13-9370 /var/www/html/d9.localhost/web/modules/contrib/token (8.x-1.x=) $ git apply -v token-deprecated_license_identifier-3131054-2.patch
Checking patch composer.json...
Applied patch composer.json cleanly.

Also, it wouldn't pass the automated test if the patch does not apply.

lolandese’s picture

lolandese CreditAttribution: lolandese at Cognizant Technology Solutions commented
Status: Needs work » Needs review
ngkoutsaik’s picture

ngkoutsaik CreditAttribution: ngkoutsaik at Agiledrop - Your Trusted Drupal Teammates commented

Maybe I did not communicate that well. I used first git apply -v patchname. I am on the latest branch.

Here is the output I get 

git apply -v token-deprecated_license_identifier-3131054-2.patch
Checking patch composer.json...
error: while searching for:
{
  "name": "drupal/token",
  "type": "drupal-module",
  "license": "GPL-2.0+",
  "description": "Provides a user interface for the Token API, some missing core tokens.",
  "require": {
      "drupal/core": "^8.7.7 || ^9"

error: patch failed: composer.json:1
error: composer.json: patch does not appl

.

ngkoutsaik’s picture

ngkoutsaik CreditAttribution: ngkoutsaik at Agiledrop - Your Trusted Drupal Teammates commented

I had to reroll the patch for it to apply cleanly.

git apply -v test-branch.patch
Checking patch composer.json...
Applied patch composer.json cleanly.
ngkoutsaik’s picture

ngkoutsaik CreditAttribution: ngkoutsaik at Agiledrop - Your Trusted Drupal Teammates commented
FileSize
reroll-patch-3131054-9.patch369 bytes
lolandese’s picture

lolandese CreditAttribution: lolandese at Cognizant Technology Solutions commented

I understand now. A commit was made on the same composer.json file after the patch was posted. See https://git.drupalcode.org/project/token/commit/40e3765

Thanks for the reroll.

paulocs’s picture

paulocs
Primary language Portuguese, Brazil
Location Belo Horizonte
CreditAttribution: paulocs at CI&T commented
Status: Needs review » Reviewed & tested by the community
FileSize
Screenshot from 2020-06-18 15-19-14.png16.04 KB

Patch #9 looks good to me!

thalles’s picture

thalles
Primary language Portuguese, Brazil
Location Teófilo Otoni - MG
CreditAttribution: thalles at CI&T commented

#9 looks good to me!
+1 RTBC

TR’s picture

TR CreditAttribution: TR commented

Still applies, still passes. +1 RTBC.

Berdir’s picture

Berdir
Primary language German
Location Switzerland
CreditAttribution: Berdir at MD Systems GmbH commented
Status: Reviewed & tested by the community » Fixed

Thanks, committed.

  • Berdir committed bd6e316 on 8.x-1.x authored by lolandese 
    Issue #3131054 by lolandese, ngkoutsaik, paulocs: License "GPL-2.0+" is...
Matroskeen’s picture

Matroskeen
Primary language Ukrainian
Location 🇺🇦 Ukraine, Lutsk
CreditAttribution: Matroskeen at DevBranch, Evolving Web, Drupal Ukraine Community commented

This probably should be marked as "Fixed".

lolandese’s picture

lolandese CreditAttribution: lolandese at Cognizant Technology Solutions commented
Status: Reviewed & tested by the community » Fixed

Status: Fixed » Closed (fixed)

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