Skip to content

Commit

Permalink
Update branch aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
@driesvints
driesvints committed Jan 7, 2020
1 parent f3c1f48 commit d06cc79
Show file tree
Hide file tree
Showing 28 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion src/Illuminate/Auth/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Broadcasting/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Bus/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cache/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Config/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Console/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Container/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Contracts/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cookie/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Encryption/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Events/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Filesystem/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Hashing/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Http/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Log/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Notifications/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pagination/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pipeline/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Queue/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Redis/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Routing/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Session/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Translation/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/View/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"

This comment has been minimized.

Sign in to view

Copy link
@TBlindaruk

TBlindaruk Jan 7, 2020 •
edited
Loading

Contributor

hm...
is it true?

dev-master it is 7.*

--

dev-6.x it is 6.x

isn`t?

This comment has been minimized.

Sign in to view

Copy link
@driesvints

driesvints Jan 7, 2020

Author Member

On 6.x it'd 6.x-dev and on master it's 7.x-dev. Do you see it different somewhere?

This comment has been minimized.

Sign in to view

Copy link
@GrahamCampbell

GrahamCampbell Jan 7, 2020

Member

It only matters what its value in the actual master branch is. Packagist only looks at the master branch to find out what it's alias is. If another branch says master is something, that doesnt matter.

This comment has been minimized.

Sign in to view

Copy link
@driesvints

driesvints Jan 7, 2020

Author Member

I'd like to keep consistency between the branches.
}
},
"config": {
Expand Down

0 comments on commit d06cc79

Please sign in to comment.