Skip to content

build(deps): bump guzzlehttp/psr7 from 1.7.0 to 1.8.5 #204

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

Open
wants to merge 2 commits into
base: master
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
2 changes: 1 addition & 1 deletion app/Console/Commands/MakeApiControllerCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MakeApiControllerCommand extends GeneratorCommand
/**
* Create a new command instance.
*
* @param Filesystem $file
* @param Filesystem $file
*/
public function __construct(Filesystem $file)
{
Expand Down
9 changes: 5 additions & 4 deletions app/Http/Controllers/Api/ApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ public function __construct()
/**
* Display a listing of the resource.
*
* @param Request $request
* @param Request $request
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*
* @throws \Illuminate\Validation\ValidationException
*/
public function index(Request $request)
Expand Down Expand Up @@ -128,7 +129,7 @@ public function store()
/**
* Display the specified resource.
*
* @param int $id
* @param int $id
* @return JsonResource
*/
public function show($id)
Expand All @@ -143,7 +144,7 @@ public function show($id)
/**
* Update the specified resource in storage.
*
* @param int $id
* @param int $id
* @return JsonResource
*/
public function update($id)
Expand All @@ -162,7 +163,7 @@ public function update($id)
/**
* Remove the specified resource from storage.
*
* @param int $id
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/Api/OrderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public function destroyRequest()
/**
* Create an Order, which requires adding one or more Items to the Order.
*
* @param Request $request
* @param Request $request
* @return Response
*/
public function storeOrder(StoreOrder $request)
Expand Down Expand Up @@ -114,7 +114,7 @@ public function storeOrder(StoreOrder $request)
/**
* Add one or more Items to an existing Order.
*
* @param UpdateOrder $request
* @param UpdateOrder $request
* @return Response
*/
public function addItems(UpdateOrder $request)
Expand Down Expand Up @@ -146,7 +146,7 @@ public function addItems(UpdateOrder $request)
/**
* Remove one or more Items from an existing Order.
*
* @param UpdateOrder $request
* @param UpdateOrder $request
* @return Response
*/
public function removeItems(UpdateOrder $request)
Expand Down
7 changes: 4 additions & 3 deletions app/Repositories/BaseRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public function all()
}

/**
* @param int $limit
* @param int|null $paginate
* @param int $limit
* @param int|null $paginate
* @return mixed
*/
public function limit(int $limit, int $paginate = null)
Expand All @@ -35,7 +35,7 @@ public function limit(int $limit, int $paginate = null)
}

/**
* @param int $paginate
* @param int $paginate
* @return mixed
*/
public function paginate(int $paginate)
Expand All @@ -45,6 +45,7 @@ public function paginate(int $paginate)

/**
* @return object
*
* @throws \ReflectionException
*/
public function new()
Expand Down
4 changes: 2 additions & 2 deletions app/Repositories/CountryRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
class CountryRepository extends BaseRepository implements CountryRepositoryInterface
{
/**
* @var string
* @var string
*/
protected $class = Country::class;

/**
* @var Country
* @var Country
*/
protected $country;

Expand Down
6 changes: 3 additions & 3 deletions app/Repositories/UserRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ class UserRepository extends CrudRepository implements UserRepositoryInterface
/**
* UserRepository constructor.
*
* @param User $user
* @param AccountRepositoryInterface $account
* @param Hasher $hasher
* @param User $user
* @param AccountRepositoryInterface $account
* @param Hasher $hasher
*/
public function __construct(
User $user,
Expand Down
57 changes: 46 additions & 11 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions config/cartalyst.sentinel.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
* bundled with this package in the LICENSE file.
*
* @version 2.0.17
*
* @author Cartalyst LLC
* @license BSD License (3-clause)
* @copyright (c) 2011-2017, Cartalyst LLC
*
* @link http://cartalyst.com
*/

Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/Controllers/FeaturedControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected function getJsonStructure()
/**
* Create an Artist.
*
* @param array $properties
* @param array $properties
* @return \App\Artist
*/
protected function createArtist(array $properties = [])
Expand All @@ -81,7 +81,7 @@ protected function createArtist(array $properties = [])
/**
* Make an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function makeAlbum(array $properties = [])
Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/Controllers/OrderControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ protected function createUser()
/**
* Make an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function makeAlbum(array $properties = [])
Expand Down Expand Up @@ -367,7 +367,7 @@ protected function createSong()
/**
* Make an Order Item.
*
* @param array $properties
* @param array $properties
* @return \App\DigitalAsset
*/
protected function makeOrderItem($properties = [])
Expand Down
8 changes: 4 additions & 4 deletions tests/Feature/Featured/FeaturedArtisanCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function testWhenCalledFeatureArtisanCommandFeaturesExpectedEntities()
/**
* Create an Artist.
*
* @param array $properties
* @param array $properties
* @return \App\Artist
*/
protected function createArtist(array $properties = [])
Expand All @@ -118,7 +118,7 @@ protected function createArtist(array $properties = [])
/**
* Create an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function createAlbum(array $properties = [])
Expand All @@ -133,7 +133,7 @@ protected function createAlbum(array $properties = [])
/**
* Make an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function makeAlbum(array $properties = [])
Expand All @@ -148,7 +148,7 @@ protected function makeAlbum(array $properties = [])
/**
* Make an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function makeAlbumWithSongs(array $properties = [])
Expand Down
8 changes: 4 additions & 4 deletions tests/Feature/Featured/FeaturedArtistEligibilityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function testFeaturableResultsMatchExpected()
/**
* Create an Artist.
*
* @param array $properties
* @param array $properties
* @return \App\Artist
*/
protected function createArtist(array $properties = [])
Expand All @@ -187,7 +187,7 @@ protected function createArtist(array $properties = [])
/**
* Create an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function createAlbum(array $properties = [])
Expand All @@ -202,7 +202,7 @@ protected function createAlbum(array $properties = [])
/**
* Make an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function makeAlbum(array $properties = [])
Expand All @@ -217,7 +217,7 @@ protected function makeAlbum(array $properties = [])
/**
* Make a Digital Asset.
*
* @param array $properties
* @param array $properties
* @return \App\DigitalAsset
*/
protected function makeDigitalAsset($properties = [])
Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/Repositories/AccountRepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ public function testWhenAccountRelatedToCountryItBelongsToCountry()
/**
* Make a new User object.
*
* @param array $userProperties
* @param array $accountProperties
* @param array $userProperties
* @param array $accountProperties
* @return \App\User
*/
protected function makeUser(array $userProperties = [], array $accountProperties = [])
Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/Repositories/AlbumRepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public function testWhenAlbumSoldItMorphsManyDigitalAsset()
/**
* Create an Album.
*
* @param array $properties
* @param array $properties
* @return \App\Album
*/
protected function makeAlbum(array $properties = [])
Expand Down Expand Up @@ -243,7 +243,7 @@ protected function makeAlbum(array $properties = [])
/**
* Make a Digital Asset.
*
* @param array $properties
* @param array $properties
* @return \App\DigitalAsset
*/
protected function makeDigitalAsset(array $properties = [])
Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/Repositories/ArtistRepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ public function testWhenArtistRelatedToAlbumItHasManySongs()
/**
* Create a new User.
*
* @param array $userProperties
* @param array $accountProperties
* @param array $userProperties
* @param array $accountProperties
* @return \App\User
*/
protected function createUser(array $userProperties = [], array $accountProperties = [])
Expand Down
Loading