fix(cs): php-cs-fixer and stan

PUGX · May 19, 2020 · 5b66a68 · 5b66a68
1 parent 98af003
commit 5b66a68
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 20 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -250,16 +250,6 @@ parameters:
 			count: 1
 			path: tests/Contributors/Command/UpdateCommandTest.php
 
-		-
-			message: "#^Method App\\\\Tests\\\\Contributors\\\\Service\\\\RepositoryTest\\:\\:checkUrl\\(\\) has parameter \\$url with no typehint specified\\.$#"
-			count: 1
-			path: tests/Contributors/Service/RepositoryTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 1
-			path: tests/Contributors/Service/RepositoryTest.php
-
 		-
 			message: "#^Method App\\\\Tests\\\\Contributors\\\\Service\\\\RepositoryTest\\:\\:getFakeResultPagerFetchAll\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/src/Badge/Infrastructure/Package/PackageRepository.php b/src/Badge/Infrastructure/Package/PackageRepository.php
@@ -57,10 +57,10 @@ public function fetchByRepository(string $repository): Package
         }
 
         if (
-            $apiPackage instanceof ApiPackage 
-            && !empty($repoGitHubData) 
-            && array_key_exists('default_branch', $repoGitHubData)
-            && is_string($repoGitHubData['default_branch'])
+            $apiPackage instanceof ApiPackage
+            && !empty($repoGitHubData)
+            && \array_key_exists('default_branch', $repoGitHubData)
+            && \is_string($repoGitHubData['default_branch'])
         ) {
             // create a new Package from the ApiPackage
             /** @var Package $class */

diff --git a/src/Badge/Model/Badge.php b/src/Badge/Model/Badge.php
@@ -87,7 +87,7 @@ private function escapeValue(string $value): string
             '-',
         ];
         $ret = \preg_replace($pattern, $replacement, $value);
-        if ($ret === null) {
+        if (null === $ret) {
             throw new \RuntimeException('Error while escaping');
         }
 

diff --git a/src/Badge/Model/Image.php b/src/Badge/Model/Image.php
@@ -57,12 +57,12 @@ public function getOutputFileName(): string
     private function cleanName(): string
     {
         $clean = \iconv('UTF-8', 'ASCII//TRANSLIT', $this->name);
-        if ($clean === false) {
+        if (false === $clean) {
             throw new \RuntimeException('Error while parsing image name');
         }
-        
+
         $clean = \preg_replace('/[^a-zA-Z0-9_|+ -]/', '', $clean);
-        if ($clean === null) {
+        if (null === $clean) {
             throw new \RuntimeException('Error while parsing image name');
         }
 

diff --git a/src/Badge/Model/Package.php b/src/Badge/Model/Package.php
@@ -41,6 +41,7 @@ private function __construct(ApiPackage $apiPackage, array $repoGitHubData)
 
     /**
      * Create a new Package decorated with the Api Package.
+     *
      * @param array{default_branch: string} $repoGitHubData
      */
     public static function createFromApi(ApiPackage $apiPackage, array $repoGitHubData): self
@@ -93,6 +94,7 @@ private function calculateLatestVersions(): self
 
     /**
      * Get all the branch aliases.
+     *
      * @return array<string, string>|null
      */
     private function getBranchAliases(ApiPackage\Version $version): ?array

diff --git a/tests/Contributors/Service/RepositoryTest.php b/tests/Contributors/Service/RepositoryTest.php
@@ -81,8 +81,8 @@ public function testUpdateCache(): void
     private function checkUrl(string $url): void
     {
         $data = \file_get_contents($url);
-        $this->assertNotFalse($data, 'Unable to open URL: '.$url);
-        $this->assertGreaterThan(0, \strlen($data));
+        $this->assertNotFalse((bool) $data, 'Unable to open URL: '.$url);
+        $this->assertGreaterThan(0, \strlen((string) $data));
     }
 
     private function getFakeResultPagerFetchAll(): array