Skip to content

Commit

Permalink
Merge pull request #1468 from liip/cs
Browse files Browse the repository at this point in the history
adjust codestyle to newest php-cs-fixer
  • Loading branch information
dbu authored May 23, 2022
2 parents 1a04fac + e9802a6 commit 3efa270
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/.idea/
/.php_cs.cache
/.php-cs-fixer.cache
/.phpunit.result.cache
/bin/
/composer.lock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private function stringifyOptions(array $options = []): string
*/
private function stringifyOptionValue($value): string
{
if (is_scalar($value)) {
if (\is_scalar($value)) {
return $value;
}

Expand Down
8 changes: 4 additions & 4 deletions Tests/Functional/Controller/ImagineControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function provideImageNames(): iterable
*/
public function testShouldResolvePopulatingCacheFirst($image, $urlimage): void
{
//guard
// guard
$this->assertFileDoesNotExist($this->cacheRoot.'/thumbnail_web_path/images/'.$image);

$this->client->request('GET', '/media/cache/resolve/thumbnail_web_path/images/'.$urlimage);
Expand All @@ -86,7 +86,7 @@ public function testShouldResolvePopulatingCacheFirst($image, $urlimage): void

public function testShouldResolvePopulatingCacheFirstWebP(): void
{
//guard
// guard
$this->assertFileDoesNotExist($this->cacheRoot.'/thumbnail_web_path/images/cats.jpeg');

$this->client->request('GET', '/media/cache/resolve/thumbnail_web_path/images/cats.jpeg', [], [], [
Expand Down Expand Up @@ -218,7 +218,7 @@ public function testShouldResolveWithCustomFiltersPopulatingCacheFirst(): void

$url = 'http://localhost/media/cache/resolve/'.$expectedCachePath.'?'.http_build_query($params);

//guard
// guard
$this->assertFileDoesNotExist($this->cacheRoot.'/'.$expectedCachePath);

$this->client->request('GET', $url);
Expand Down Expand Up @@ -256,7 +256,7 @@ public function testShouldResolveWithCustomFiltersPopulatingCacheFirstWebP(): vo

$url = 'http://localhost/media/cache/resolve/'.$expectedCachePath.'?'.http_build_query($params);

//guard
// guard
$this->assertFileDoesNotExist($this->cacheRoot.'/'.$expectedCachePath);

$this->client->request('GET', $url, [], [], [
Expand Down
4 changes: 2 additions & 2 deletions Tests/Imagine/Filter/Loader/GrayscaleFilterLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ public function testLoadGrayscale(): void
// Generate blue image
$image = $imagine->create(new Box(20, 20), $palette->color([20, 90, 240]));

//Apply Grayscale filter
// Apply Grayscale filter
$result = $loader->load($image);

//Test result
// Test result
$pixel = $result->getColorAt(new Point(10, 10));
$this->assertSame('#565656', (string) $pixel);
}
Expand Down

0 comments on commit 3efa270

Please sign in to comment.