[BUGFIX] Fix tests

TYPO3 · Nov 17, 2021 · a74ef5d · a74ef5d
1 parent c560c3b
commit a74ef5d
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /.idea/
 /.php_cs.cache
+/.php-cs-fixer.cache
 /.DS_Store
 /vendor
 /.env

diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
             "@php vendor/bin/phpunit --testsuite Unit"
         ],
         "cs": [
-            "@php vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff --config=vendor/typo3/coding-standards/templates/extension_php_cs.dist src/ tests/"
+            "@php vendor/bin/php-cs-fixer fix --dry-run --diff --config=vendor/typo3/coding-standards/templates/extension_php-cs-fixer.dist.php src/ tests/"
         ]
     }
 }
diff --git a/src/Command/Extension/UploadExtensionVersionCommand.php b/src/Command/Extension/UploadExtensionVersionCommand.php
@@ -121,7 +121,7 @@ protected function getFormDataPart(array $options): FormDataPart
         return new FormDataPart([
             'description' => (string)$options['comment'],
             'gplCompliant' => '1',
-            'file' => DataPart::fromPath($versionService->getVersionFilePath())
+            'file' => DataPart::fromPath($versionService->getVersionFilePath()),
         ]);
     }
 

diff --git a/src/Formatter/ConsoleFormatter.php b/src/Formatter/ConsoleFormatter.php
@@ -117,7 +117,7 @@ protected function formatTable(array $content): void
             new OutputPart(
                 [
                     ['Extension Key', 'Title', 'Latest Version', 'Last Updated on', 'Composer Name'],
-                    $extensions
+                    $extensions,
                 ],
                 OutputPart::OUTPUT_TABLE
             )

diff --git a/src/HttpClientFactory.php b/src/HttpClientFactory.php
@@ -41,7 +41,7 @@ public static function create(RequestConfiguration $requestConfiguration): HttpC
                 'User-Agent' => 'Tailor - Your TYPO3 Extension Helper',
             ], $requestConfiguration->getHeaders()),
             // REST API does not perform redirects
-            'max_redirects' => 0
+            'max_redirects' => 0,
         ];
         if ($requestConfiguration->getQuery() !== []) {
             $options['query'] = $requestConfiguration->getQuery();

diff --git a/tests/Unit/Fixtures/EmConf/emconf_invalid.php b/tests/Unit/Fixtures/EmConf/emconf_invalid.php
@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'YES' => true
+    'YES' => true,
 ];
diff --git a/tests/Unit/Fixtures/EmConf/emconf_no_structure.php b/tests/Unit/Fixtures/EmConf/emconf_no_structure.php
@@ -1,5 +1,5 @@
 <?php
 
 $EM_CONF = [
-    'nothing' => 'YES'
+    'nothing' => 'YES',
 ];
diff --git a/tests/Unit/Fixtures/EmConf/emconf_no_version.php b/tests/Unit/Fixtures/EmConf/emconf_no_version.php
@@ -1,5 +1,5 @@
 <?php
 
 $EM_CONF = [
-    'nothing' => 'YES'
+    'nothing' => 'YES',
 ];
diff --git a/tests/Unit/Fixtures/EmConf/emconf_valid.php b/tests/Unit/Fixtures/EmConf/emconf_valid.php
@@ -14,6 +14,6 @@
     'constraints' => [
         'depends' => [
             'typo3' => '10.0.0-11.99.99',
-        ]
-    ]
+        ],
+    ],
 ];
diff --git a/tests/Unit/Fixtures/EmConf/emconf_valid_string_array_key.php b/tests/Unit/Fixtures/EmConf/emconf_valid_string_array_key.php
@@ -14,6 +14,6 @@
     'constraints' => [
         'depends' => [
             'typo3' => '10.0.0-11.99.99',
-        ]
-    ]
+        ],
+    ],
 ];
diff --git a/tests/Unit/Fixtures/ExcludeFromPackaging/config_invalid.php b/tests/Unit/Fixtures/ExcludeFromPackaging/config_invalid.php
@@ -2,6 +2,6 @@
 
 return [
     'folders' => [
-        'dummy'
-    ]
+        'dummy',
+    ],
 ];
diff --git a/tests/Unit/Fixtures/ExcludeFromPackaging/config_valid.php b/tests/Unit/Fixtures/ExcludeFromPackaging/config_valid.php
@@ -2,9 +2,9 @@
 
 return [
     'directories' => [
-        'dummy'
+        'dummy',
     ],
     'files' => [
         'dummy',
-    ]
+    ],
 ];
diff --git a/tests/Unit/Formatter/ConsoleFormatterTest.php b/tests/Unit/Formatter/ConsoleFormatterTest.php
@@ -53,19 +53,19 @@ public function formatReturnsFormattedPartsDataProvider(): \Generator
         yield 'No output' => [
             [
                 'some' => [
-                    'dummy' => 'data'
-                ]
+                    'dummy' => 'data',
+                ],
             ],
             [],
             [],
-            ConsoleFormatter::FORMAT_NONE
+            ConsoleFormatter::FORMAT_NONE,
         ];
         yield 'Simple key/values array' => [
             [
                 'dummy' => 'data',
                 'noKey',
                 'notKeyValue' => [
-                    'foo' => 'bar'
+                    'foo' => 'bar',
                 ],
                 'some_Key' => 'otherData',
             ],
@@ -75,7 +75,7 @@ public function formatReturnsFormattedPartsDataProvider(): \Generator
                 ['<info>Some Key</info>: otherData'],
             ],
             [],
-            ConsoleFormatter::FORMAT_KEY_VALUE
+            ConsoleFormatter::FORMAT_KEY_VALUE,
         ];
         yield 'Extension details list' => [
             [
@@ -87,12 +87,12 @@ public function formatReturnsFormattedPartsDataProvider(): \Generator
                     'paypal_url' => '',
                     'tags' => [
                         [
-                            'title' => 'sometag'
+                            'title' => 'sometag',
                         ],
                         [
-                            'title' => 'anothertag'
-                        ]
-                    ]
+                            'title' => 'anothertag',
+                        ],
+                    ],
                 ],
                 'current_version' => [
                     'title' => 'foobar',
@@ -101,28 +101,28 @@ public function formatReturnsFormattedPartsDataProvider(): \Generator
                     'state' => 'stable',
                     'category' => 'be',
                     'typo3_versions' => [
-                        9, 10
+                        9, 10,
                     ],
                     'dependencies' => [
                         'typo3' => '10.0.0 - 10.99.99',
                     ],
                     'conflicts' => [
-                        'templavoila' => '*'
+                        'templavoila' => '*',
                     ],
                     'downloads' => 1234,
                     'upload_date' => 1606400890,
                     'review_state' => 0,
                     'download' => [
                         'composer' => 'composer req vendor/some_ext',
                         'zip' => 'https://extensions.typo3.org/extension/download/some_ext/1.0.0/zip',
-                        't3x' => 'https://extensions.typo3.org/extension/download/some_ext/1.0.0/t3x'
+                        't3x' => 'https://extensions.typo3.org/extension/download/some_ext/1.0.0/t3x',
                     ],
                     'author' => [
                         'name' => 'John Doe',
                         'email' => 'some-mail@example.com',
-                        'company' => 'ACME Inc'
-                    ]
-                ]
+                        'company' => 'ACME Inc',
+                    ],
+                ],
             ],
             [
                 ['<info>Key</info>: some_ext'],
@@ -156,10 +156,10 @@ public function formatReturnsFormattedPartsDataProvider(): \Generator
                 [PHP_EOL . 'Author'],
                 ['<info>Name</info>: John Doe'],
                 ['<info>Email</info>: some-mail@example.com'],
-                ['<info>Company</info>: ACME Inc']
+                ['<info>Company</info>: ACME Inc'],
             ],
             [],
-            ConsoleFormatter::FORMAT_DETAIL
+            ConsoleFormatter::FORMAT_DETAIL,
         ];
         yield 'Details with empty array' => [
             [
@@ -168,60 +168,60 @@ public function formatReturnsFormattedPartsDataProvider(): \Generator
                 'version_count' => 2,
                 'meta' => [
                     'composer_name' => 'vendor/some_ext',
-                    'tags' => []
+                    'tags' => [],
                 ],
-                'current_version' => []
+                'current_version' => [],
             ],
             [
                 ['<info>Key</info>: some_ext'],
                 ['<info>Downloads</info>: 60'],
                 ['<info>Version count</info>: 2'],
                 [PHP_EOL . 'Meta'],
-                ['<info>Composer name</info>: vendor/some_ext']
+                ['<info>Composer name</info>: vendor/some_ext'],
             ],
             [],
-            ConsoleFormatter::FORMAT_DETAIL
+            ConsoleFormatter::FORMAT_DETAIL,
         ];
         yield 'Find extensions result' => [
             [
                 'results' => 2,
                 'page' => 1,
                 'per_page' => 2,
                 'filter' => [
-                    'username' => 'some_user'
+                    'username' => 'some_user',
                 ],
                 'extensions' => [
                     [
                         'key' => 'some_ext',
                         'meta' => [
-                            'composer_name' => 'vendor/some_ext'
+                            'composer_name' => 'vendor/some_ext',
                         ],
                         'current_version' => [
                             'title' => 'foobar',
                             'number' => '1.0.0',
-                            'upload_date' => 1605785659
-                        ]
+                            'upload_date' => 1605785659,
+                        ],
                     ],
                     [
-                        'key' => 'another_ext'
-                    ]
-                ]
+                        'key' => 'another_ext',
+                    ],
+                ],
             ],
             [
                 [
                     ['Extension Key', 'Title', 'Latest Version', 'Last Updated on', 'Composer Name'],
                     [
                         'another_ext' => ['another_ext', '-', '-', '-', '-'],
-                        'some_ext' => ['some_ext', 'foobar', '1.0.0', '19.11.2020', 'vendor/some_ext']
-                    ]
+                        'some_ext' => ['some_ext', 'foobar', '1.0.0', '19.11.2020', 'vendor/some_ext'],
+                    ],
                 ],
-                ['Page: 1, Per page: 2, Filter: some_user (Author)']
+                ['Page: 1, Per page: 2, Filter: some_user (Author)'],
             ],
             [
                 OutputPart::OUTPUT_TABLE,
-                OutputPart::OUTPUT_WRITE_LINE
+                OutputPart::OUTPUT_WRITE_LINE,
             ],
-            ConsoleFormatter::FORMAT_TABLE
+            ConsoleFormatter::FORMAT_TABLE,
         ];
     }
 }
diff --git a/tests/Unit/Validation/VersionValidatorTest.php b/tests/Unit/Validation/VersionValidatorTest.php
@@ -38,35 +38,35 @@ public function isValidTestDataProvider(): \Generator
     {
         yield 'Wrong format' => [
             'v1',
-            false
+            false,
         ];
         yield 'Wrong delimiter' => [
             '1-0-0',
-            false
+            false,
         ];
         yield 'Missing patch version' => [
             '1.0',
-            false
+            false,
         ];
         yield 'Patch version to high' => [
             '1.0.1000',
-            false
+            false,
         ];
         yield 'Patch version to low' => [
             '1.0.-12',
-            false
+            false,
         ];
         yield 'Not numeric' => [
             '0.2.0-alpha',
-            false
+            false,
         ];
         yield 'Valid version' => [
             '1.0.0',
-            true
+            true,
         ];
         yield 'Valid version 2' => [
             '10.4.999',
-            true
+            true,
         ];
     }
 }