Format code using PHP-CS-Fixer

Author: cundd

.php-cs-fixer.dist.php

@@ -0,0 +1,29 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())->in(__DIR__);
+
+return (new PhpCsFixer\Config())
+    ->setRules(
+        [
+            '@PSR12'   => true,
+            '@Symfony' => true,
+            // Only allowed if risky rules are enabled: 'strict_param' => true,
+            'array_indentation'                                => true,
+            'array_syntax'                                     => ['syntax' => 'short'],
+            'binary_operator_spaces'                           => ['operators' => ['=>' => 'align_single_space_minimal']],
+            'concat_space'                                     => ['spacing' => 'one'],
+            'global_namespace_import'                          => ['import_classes' => true, 'import_constants' => true, 'import_functions' => true],
+            'method_argument_space'                            => ['on_multiline' => 'ensure_fully_multiline'],
+            'method_chaining_indentation'                      => true,
+            'no_alias_language_construct_call'                 => false,
+            'no_unneeded_control_parentheses'                  => false,
+            'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
+            'phpdoc_annotation_without_dot'                    => true,
+            'phpdoc_summary'                                   => false,
+            'simplified_if_return'                             => true,
+            'single_line_throw'                                => false,
+        ],
+    )
+
+    ->setFinder($finder)
+;

Build/FunctionalTestsBootstrap.php

@@ -1,4 +1,7 @@
 <?php
+
+use TYPO3\TestingFramework\Core\Testbase;
+
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -13,7 +16,7 @@
  */
 
 call_user_func(function () {
-    $testbase = new \TYPO3\TestingFramework\Core\Testbase();
+    $testbase = new Testbase();
     $testbase->defineOriginalRootPath();
     $testbase->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/tests');
     $testbase->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/transient');

Build/UnitTestsBootstrap.php

@@ -1,4 +1,16 @@
 <?php
+
+use TYPO3\CMS\Core\Cache\Backend\NullBackend;
+use TYPO3\CMS\Core\Cache\Frontend\PhpFrontend;
+use TYPO3\CMS\Core\Configuration\ConfigurationManager;
+use TYPO3\CMS\Core\Core\Bootstrap;
+use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
+use TYPO3\CMS\Core\Package\UnitTestPackageManager;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Testbase;
+
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -13,7 +25,7 @@
  */
 
 call_user_func(function () {
-    $testbase = new \TYPO3\TestingFramework\Core\Testbase();
+    $testbase = new Testbase();
 
     // These if's are for core testing (package typo3/cms) only. cms-composer-installer does
     // not create the autoload-include.php file that sets these env vars and sets composer
@@ -32,36 +44,36 @@
     $testbase->defineSitePath();
 
     $composerMode = defined('TYPO3_COMPOSER_MODE') && TYPO3_COMPOSER_MODE === true;
-    $requestType = \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_BE | \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_CLI;
-    \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::run(0, $requestType, $composerMode);
+    $requestType = SystemEnvironmentBuilder::REQUESTTYPE_BE | SystemEnvironmentBuilder::REQUESTTYPE_CLI;
+    SystemEnvironmentBuilder::run(0, $requestType, $composerMode);
 
-    $testbase->createDirectory(\TYPO3\CMS\Core\Core\Environment::getPublicPath() . '/typo3conf/ext');
-    $testbase->createDirectory(\TYPO3\CMS\Core\Core\Environment::getPublicPath() . '/typo3temp/assets');
-    $testbase->createDirectory(\TYPO3\CMS\Core\Core\Environment::getPublicPath() . '/typo3temp/var/tests');
-    $testbase->createDirectory(\TYPO3\CMS\Core\Core\Environment::getPublicPath() . '/typo3temp/var/transient');
+    $testbase->createDirectory(Environment::getPublicPath() . '/typo3conf/ext');
+    $testbase->createDirectory(Environment::getPublicPath() . '/typo3temp/assets');
+    $testbase->createDirectory(Environment::getPublicPath() . '/typo3temp/var/tests');
+    $testbase->createDirectory(Environment::getPublicPath() . '/typo3temp/var/transient');
 
     // Retrieve an instance of class loader and inject to core bootstrap
     $classLoader = require $testbase->getPackagesPath() . '/autoload.php';
-    \TYPO3\CMS\Core\Core\Bootstrap::initializeClassLoader($classLoader);
+    Bootstrap::initializeClassLoader($classLoader);
 
     // Initialize default TYPO3_CONF_VARS
-    $configurationManager = new \TYPO3\CMS\Core\Configuration\ConfigurationManager();
+    $configurationManager = new ConfigurationManager();
     $GLOBALS['TYPO3_CONF_VARS'] = $configurationManager->getDefaultConfiguration();
 
-    $cache = new \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend(
+    $cache = new PhpFrontend(
         'core',
-        new \TYPO3\CMS\Core\Cache\Backend\NullBackend('production', []),
+        new NullBackend('production', []),
     );
     // Set all packages to active
-    $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::createPackageManager(
-        \TYPO3\CMS\Core\Package\UnitTestPackageManager::class,
-        \TYPO3\CMS\Core\Core\Bootstrap::createPackageCache($cache)
+    $packageManager = Bootstrap::createPackageManager(
+        UnitTestPackageManager::class,
+        Bootstrap::createPackageCache($cache)
     );
 
-    \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Package\PackageManager::class, $packageManager);
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::setPackageManager($packageManager);
+    GeneralUtility::setSingletonInstance(TYPO3\CMS\Core\Package\PackageManager::class, $packageManager);
+    ExtensionManagementUtility::setPackageManager($packageManager);
 
     $testbase->dumpClassLoadingInformation();
 
-    \TYPO3\CMS\Core\Utility\GeneralUtility::purgeInstances();
+    GeneralUtility::purgeInstances();
 });

Classes/Access/AbstractAccessController.php

@@ -19,8 +19,6 @@ public function __construct(protected ObjectManagerInterface $objectManager)
     /**
      * Checks if a valid user is logged in
      *
-     * @param RestRequestInterface $request
-     * @return Access
      * @throws Exception
      */
     protected function checkAuthentication(RestRequestInterface $request): Access
@@ -32,6 +30,6 @@ protected function checkAuthentication(RestRequestInterface $request): Access
             throw $exception;
         }
 
-        return $isAuthenticated === false ? Access::unauthorized() : Access::authorized();
+        return false === $isAuthenticated ? Access::unauthorized() : Access::authorized();
     }
 }

Classes/Access/AccessControllerInterface.php

@@ -11,17 +11,11 @@ interface AccessControllerInterface
 {
     /**
      * Returns if the current request's client has access to the requested resource
-     *
-     * @param RestRequestInterface $request
-     * @return Access
      */
     public function getAccess(RestRequestInterface $request): Access;
 
     /**
      * Returns if the given request needs authentication
-     *
-     * @param RestRequestInterface $request
-     * @return bool
      */
     public function requestNeedsAuthentication(RestRequestInterface $request): bool;
 }

Classes/Access/ConfigurationBasedAccessController.php

@@ -27,15 +27,13 @@ class ConfigurationBasedAccessController extends AbstractAccessController
 
     public function __construct(
         ConfigurationProviderInterface $configurationProvider,
-        ObjectManagerInterface $objectManager
+        ObjectManagerInterface $objectManager,
     ) {
         parent::__construct($objectManager);
         $this->configurationProvider = $configurationProvider;
     }
 
     /**
-     * @param RestRequestInterface $request
-     * @return Access
      * @throws InvalidConfigurationException
      */
     public function getAccess(RestRequestInterface $request): Access
@@ -50,9 +48,6 @@ public function getAccess(RestRequestInterface $request): Access
 
     /**
      * Returns the configuration matching the given resource type
-     *
-     * @param ResourceType $resourceType
-     * @return ResourceConfiguration
      */
     public function getConfigurationForResourceType(ResourceType $resourceType): ResourceConfiguration
     {
@@ -62,8 +57,6 @@ public function getConfigurationForResourceType(ResourceType $resourceType): Res
     /**
      * Returns if the given request needs authentication
      *
-     * @param RestRequestInterface $request
-     * @return bool
      * @throws InvalidConfigurationException
      */
     public function requestNeedsAuthentication(RestRequestInterface $request): bool
@@ -73,19 +66,12 @@ public function requestNeedsAuthentication(RestRequestInterface $request): bool
 
     /**
      * Returns if the given request requires authorization
-     *
-     * @param RestRequestInterface $request
-     * @return bool
      */
     protected function requiresAuthorization(RestRequestInterface $request): bool
     {
         return !in_array(strtoupper($request->getMethod()), self::ACCESS_NOT_REQUIRED);
     }
 
-    /**
-     * @param RestRequestInterface $request
-     * @return Access
-     */
     protected function getAccessConfiguration(RestRequestInterface $request): Access
     {
         if (!$this->requiresAuthorization($request)) {

Classes/Authentication/AbstractAuthenticationProvider.php

@@ -11,7 +11,6 @@ abstract class AbstractAuthenticationProvider implements AuthenticationProviderI
     /**
      * Tries to authenticate the current request
      *
-     * @param RestRequestInterface $request
      * @return bool Returns if the authentication was successful
      */
     public function authenticate(RestRequestInterface $request): bool

Classes/Authentication/AuthenticationProviderCollection.php

@@ -41,7 +41,6 @@ public function __construct($providers)
     /**
      * Loops through each Authentication Provider in the collection and tries to authenticate the current request
      *
-     * @param RestRequestInterface $request
      * @return bool Returns if the authentication was successful
      */
     public function authenticate(RestRequestInterface $request): bool
@@ -59,7 +58,6 @@ public function authenticate(RestRequestInterface $request): bool
     /**
      * Sets the used Authentication Providers
      *
-     * @param SplObjectStorage $providers
      * @return $this
      */
     public function setProviders(SplObjectStorage $providers): self
@@ -71,8 +69,6 @@ public function setProviders(SplObjectStorage $providers): self
 
     /**
      * Returns the used Authentication Providers
-     *
-     * @return SplObjectStorage
      */
     public function getProviders(): SplObjectStorage
     {
@@ -82,7 +78,6 @@ public function getProviders(): SplObjectStorage
     /**
      * Adds the given Authentication Provider
      *
-     * @param AuthenticationProviderInterface $provider
      * @return $this
      */
     public function addProvider(AuthenticationProviderInterface $provider): self
@@ -95,7 +90,6 @@ public function addProvider(AuthenticationProviderInterface $provider): self
     /**
      * Removes the given Authentication Provider
      *
-     * @param AuthenticationProviderInterface $provider
      * @return $this
      */
     public function removeProvider(AuthenticationProviderInterface $provider): self

Classes/Authentication/AuthenticationProviderInterface.php

@@ -11,7 +11,6 @@ interface AuthenticationProviderInterface
     /**
      * Tries to authenticate the current request
      *
-     * @param RestRequestInterface $request
      * @return bool Returns if the authentication was successful
      */
     public function authenticate(RestRequestInterface $request): bool;

Classes/Authentication/BasicAuthenticationProvider.php

@@ -18,8 +18,6 @@ class BasicAuthenticationProvider extends AbstractAuthenticationProvider
 
     /**
      * BasicAuth Provider constructor
-     *
-     * @param UserProviderInterface $userProvider
      */
     public function __construct(UserProviderInterface $userProvider)
     {
@@ -29,7 +27,6 @@ public function __construct(UserProviderInterface $userProvider)
     /**
      * Tries to authenticate the current request
      *
-     * @param RestRequestInterface $request
      * @return bool Returns if the authentication was successful
      */
     public function authenticate(RestRequestInterface $request): bool
@@ -59,7 +56,7 @@ private function checkServerData($key)
     {
         if (isset($_SERVER[$key])) {
             $value = $_SERVER[$key];
-            if (strpos(strtolower($value), 'basic') === 0) {
+            if (0 === strpos(strtolower($value), 'basic')) {
                 return explode(':', base64_decode(substr($value, 6)));
             }
         }