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.

Sign up for GitHub

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 lock files for crayfish using newer chullo #61

Merged
merged 1 commit into from
Apr 16, 2019
Merged

Update lock files for crayfish using newer chullo #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
903 changes: 366 additions & 537 deletions Gemini/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

910 changes: 401 additions & 509 deletions Homarus/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

826 changes: 336 additions & 490 deletions Houdini/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

910 changes: 401 additions & 509 deletions Hypercube/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

741 changes: 288 additions & 453 deletions Milliner/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Milliner/src/Service/MillinerService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MillinerService implements MillinerServiceInterface
protected $drupal;

/**
* @var \Islandora\Milliner\Gemini\GeminiClient
* @var \Islandora\Crayfish\Commons\Client\GeminiClient
*/
protected $gemini;

Expand All @@ -44,7 +44,7 @@ class MillinerService implements MillinerServiceInterface
*
* @param \Islandora\Chullo\IFedoraApi $fedora
* @param \GuzzleHttp\Client
* @param \Islandora\Milliner\Gemini\GeminiClient
* @param \Islandora\Crayfish\Commons\Client\GeminiClient
* @param string $modifiedDatePredicate
* @param \Psr\Log\LoggerInterface $log
*/
Expand Down
10 changes: 5 additions & 5 deletions Milliner/tests/Islandora/Milliner/Tests/DeleteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Response;
use Islandora\Chullo\IFedoraClient;
use Islandora\Chullo\IFedoraApi;
use Islandora\Crayfish\Commons\Client\GeminiClient;
use Islandora\Milliner\Service\MillinerService;
use Monolog\Handler\NullHandler;
Expand Down Expand Up @@ -55,7 +55,7 @@ public function testDeleteReturnsFedoraError()
->willReturn(['drupal' => 'foo', 'fedora' => 'bar']);
$gemini = $gemini->reveal();

$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->deleteResource(Argument::any(), Argument::any())
->willReturn(new Response(403));
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -88,7 +88,7 @@ public function testDeleteReturns204OnGeminiSuccess()
->willReturn(true);
$gemini = $gemini->reveal();

$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->deleteResource(Argument::any(), Argument::any())
->willReturn(new Response(404));
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -131,7 +131,7 @@ public function testDeleteReturns404IfNotMappedAndGeminiFails()
->willReturn(false);
$gemini = $gemini->reveal();

$fedora = $this->prophesize(IFedoraClient::class)->reveal();
$fedora = $this->prophesize(IFedoraApi::class)->reveal();

$drupal = $this->prophesize(Client::class)->reveal();

Expand Down Expand Up @@ -164,7 +164,7 @@ public function testDeleteReturnsFedoraErrorIfMappedButGeminiFails()
->willReturn(false);
$gemini = $gemini->reveal();

$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->deleteResource(Argument::any(), Argument::any())
->willReturn(new Response(410));
$fedora = $fedora->reveal();
Expand Down
22 changes: 11 additions & 11 deletions Milliner/tests/Islandora/Milliner/Tests/SaveMediaTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Response;
use Islandora\Chullo\IFedoraClient;
use Islandora\Chullo\IFedoraApi;
use Islandora\Crayfish\Commons\Client\GeminiClient;
use Islandora\Milliner\Service\MillinerService;
use Monolog\Handler\NullHandler;
Expand Down Expand Up @@ -63,7 +63,7 @@ public function testSaveMediaThrows500WithNoFileField()
->willReturn($drupal_response);
$drupal = $drupal->reveal();

$fedora = $this->prophesize(IFedoraClient::class)->reveal();
$fedora = $this->prophesize(IFedoraApi::class)->reveal();

$gemini = $this->prophesize(GeminiClient::class)->reveal();

Expand Down Expand Up @@ -104,7 +104,7 @@ public function testSaveMediaThrows500WithEmptyFileField()
->willReturn($drupal_response);
$drupal = $drupal->reveal();

$fedora = $this->prophesize(IFedoraClient::class)->reveal();
$fedora = $this->prophesize(IFedoraApi::class)->reveal();

$gemini = $this->prophesize(GeminiClient::class)->reveal();

Expand Down Expand Up @@ -145,7 +145,7 @@ public function testSaveMediaThrows404WhenFileIsNotInGemini()
->willReturn($drupal_response);
$drupal = $drupal->reveal();

$fedora = $this->prophesize(IFedoraClient::class)->reveal();
$fedora = $this->prophesize(IFedoraApi::class)->reveal();

$gemini = $this->prophesize(GeminiClient::class);
$gemini->getUrls(Argument::any(), Argument::any())
Expand Down Expand Up @@ -190,7 +190,7 @@ public function testSaveMediaThrowsFedoraHeadError()
$drupal = $drupal->reveal();

$fedora_response = new Response(404);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResourceHeaders(Argument::any(), Argument::any())
->willReturn($fedora_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -242,7 +242,7 @@ public function testSaveMediaThrows500WhenNoDescribedbyHeader()
$drupal = $drupal->reveal();

$fedora_response = new Response(200);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResourceHeaders(Argument::any(), Argument::any())
->willReturn($fedora_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -302,7 +302,7 @@ public function testSaveMediaThrowsFedoraGetError()
$fedora_get_response = new Response(
404
);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResourceHeaders(Argument::any(), Argument::any())
->willReturn($fedora_head_response);
$fedora->getResource(Argument::any(), Argument::any())
Expand Down Expand Up @@ -376,7 +376,7 @@ public function testSaveMediaThrows412OnStaleData()
['Content-Type' => 'application/ld+json', 'ETag' => 'W\abc123'],
file_get_contents(__DIR__ . '/../../../../static/MediaLDP-RS.jsonld')
);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResourceHeaders(Argument::any(), Argument::any())
->willReturn($fedora_head_response);
$fedora->getResource(Argument::any(), Argument::any())
Expand Down Expand Up @@ -453,7 +453,7 @@ public function testSaveMediaThrowsFedoraPutError()
$fedora_put_response = new Response(
403
);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResourceHeaders(Argument::any(), Argument::any())
->willReturn($fedora_head_response);
$fedora->getResource(Argument::any(), Argument::any())
Expand Down Expand Up @@ -530,7 +530,7 @@ public function testSaveMediaReturnsFedoraSuccess()
$fedora_put_response = new Response(
204
);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResourceHeaders(Argument::any(), Argument::any())
->willReturn($fedora_head_response);
$fedora->getResource(Argument::any(), Argument::any())
Expand Down Expand Up @@ -613,7 +613,7 @@ public function testSaveMediaReturnsNoModifiedDate()
$fedora_put_response = new Response(
204
);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResourceHeaders(Argument::any(), Argument::any())
->willReturn($fedora_head_response);
$fedora->getResource(Argument::any(), Argument::any())
Expand Down
22 changes: 11 additions & 11 deletions Milliner/tests/Islandora/Milliner/Tests/SaveNodeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Response;
use Islandora\Chullo\IFedoraClient;
use Islandora\Chullo\IFedoraApi;
use Islandora\Crayfish\Commons\Client\GeminiClient;
use Islandora\Milliner\Service\MillinerService;
use Monolog\Handler\NullHandler;
Expand Down Expand Up @@ -70,7 +70,7 @@ public function testCreateNodeThrowsOnFedoraError()
$drupal = $drupal->reveal();

$fedora_response = new Response(403, [], null, '1.1', 'UNAUTHORIZED');
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->saveResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -124,7 +124,7 @@ public function testCreateNodeThrowsOnFedoraSaveError()
file_get_contents(__DIR__ . '/../../../../static/ContentLDP-RS.jsonld')
);
$fedora_save_response = new Response(403, [], null, '1.1', 'UNAUTHORIZED');
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_get_response);
$fedora->saveResource(Argument::any(), Argument::any(), Argument::any())
Expand Down Expand Up @@ -175,7 +175,7 @@ public function testCreateNodeReturnsFedora201()
$drupal = $drupal->reveal();

$fedora_response = new Response(201);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->saveResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -230,7 +230,7 @@ public function testCreateNodeReturnsFedora204()
$drupal = $drupal->reveal();

$fedora_response = new Response(204);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->saveResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -280,7 +280,7 @@ public function testUpdateNodeThrowsOnFedoraGetError()
$drupal = $this->prophesize(Client::class)->reveal();

$fedora_response = new Response(403, [], null, '1.1', 'UNAUTHORIZED');
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -336,7 +336,7 @@ public function testUpdateNodeThrows500OnBadDatePredicate()
['Content-Type' => 'application/ld+json'],
file_get_contents(__DIR__ . '/../../../../static/ContentLDP-RS.jsonld')
);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_get_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -392,7 +392,7 @@ public function testUpdateNodeThrows412OnStaleContent()
['Content-Type' => 'application/ld+json'],
file_get_contents(__DIR__ . '/../../../../static/ContentLDP-RS.jsonld')
);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_get_response);
$fedora = $fedora->reveal();
Expand Down Expand Up @@ -449,7 +449,7 @@ public function testUpdateNodeThrowsOnFedoraSaveError()
file_get_contents(__DIR__ . '/../../../../static/ContentLDP-RS.jsonld')
);
$fedora_save_response = new Response(403, [], null, '1.1', 'UNAUTHORIZED');
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_get_response);
$fedora->saveResource(Argument::any(), Argument::any(), Argument::any())
Expand Down Expand Up @@ -508,7 +508,7 @@ public function testUpdateNodeReturnsFedora201()
file_get_contents(__DIR__ . '/../../../../static/ContentLDP-RS.jsonld')
);
$fedora_save_response = new Response(201);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_get_response);
$fedora->saveResource(Argument::any(), Argument::any(), Argument::any())
Expand Down Expand Up @@ -573,7 +573,7 @@ public function testUpdateNodeReturnsFedora204()
file_get_contents(__DIR__ . '/../../../../static/ContentLDP-RS.jsonld')
);
$fedora_save_response = new Response(204);
$fedora = $this->prophesize(IFedoraClient::class);
$fedora = $this->prophesize(IFedoraApi::class);
$fedora->getResource(Argument::any(), Argument::any(), Argument::any())
->willReturn($fedora_get_response);
$fedora->saveResource(Argument::any(), Argument::any(), Argument::any())
Expand Down
Loading