forked from timw4mail/HummingBirdAnimeClient
More code style updates
This commit is contained in:
parent
0cff220993
commit
b13c35eaec
|
@ -5,22 +5,12 @@ use PhpCsFixer\{Config, Finder};
|
|||
|
||||
$finder = Finder::create()
|
||||
->in([
|
||||
__DIR__,
|
||||
__DIR__ . '/app',
|
||||
__DIR__ . '/src',
|
||||
__DIR__ . '/tests',
|
||||
__DIR__ . '/tools',
|
||||
])
|
||||
->exclude([
|
||||
'apidocs',
|
||||
'build',
|
||||
'coverage',
|
||||
'frontEndSrc',
|
||||
'phinx',
|
||||
'public',
|
||||
'tools',
|
||||
'tmp',
|
||||
'vendor',
|
||||
'views',
|
||||
'templates',
|
||||
]);
|
||||
|
||||
return (new Config())
|
||||
|
@ -45,7 +35,7 @@ return (new Config())
|
|||
'blank_line_after_opening_tag' => false,
|
||||
'blank_line_before_statement' => [
|
||||
'statements' => [
|
||||
'case',
|
||||
// 'case',
|
||||
'continue',
|
||||
'declare',
|
||||
'default',
|
||||
|
@ -128,12 +118,12 @@ return (new Config())
|
|||
'noise_remaining_usages_exclude' => [],
|
||||
],
|
||||
'escape_implicit_backslashes' => [
|
||||
'double_quoted' => true,
|
||||
'heredoc_syntax' => true,
|
||||
'double_quoted' => false,
|
||||
'heredoc_syntax' => false,
|
||||
'single_quoted' => false,
|
||||
],
|
||||
'explicit_indirect_variable' => true,
|
||||
'explicit_string_variable' => true,
|
||||
'explicit_indirect_variable' => false,
|
||||
'explicit_string_variable' => false,
|
||||
'final_class' => false,
|
||||
'final_internal_class' => [
|
||||
'annotation_exclude' => ['@no-final'],
|
||||
|
@ -167,7 +157,7 @@ return (new Config())
|
|||
],
|
||||
'group_import' => true,
|
||||
'header_comment' => false, // false by default
|
||||
'heredoc_indentation' => ['indentation' => 'start_plus_one'],
|
||||
// 'heredoc_indentation' => ['indentation' => 'start_plus_one'],
|
||||
'heredoc_to_nowdoc' => true,
|
||||
'implode_call' => true,
|
||||
'include' => true,
|
||||
|
@ -232,8 +222,7 @@ return (new Config())
|
|||
'allow_unused_params' => true,
|
||||
'remove_inheritdoc' => false,
|
||||
],
|
||||
'no_trailing_comma_in_list_call' => true,
|
||||
'no_trailing_comma_in_singleline_array' => true,
|
||||
'no_trailing_comma_in_singleline' => true,
|
||||
'no_trailing_whitespace' => true,
|
||||
'no_trailing_whitespace_in_comment' => true,
|
||||
'no_trailing_whitespace_in_string' => true,
|
||||
|
@ -270,9 +259,16 @@ return (new Config())
|
|||
'ordered_class_elements' => [
|
||||
'order' => [
|
||||
'use_trait',
|
||||
'constant',
|
||||
'property',
|
||||
'method',
|
||||
'case',
|
||||
'constant_public',
|
||||
'constant_protected',
|
||||
'constant_private',
|
||||
'property_public',
|
||||
'property_protected',
|
||||
'property_private',
|
||||
'construct',
|
||||
'destruct',
|
||||
'magic',
|
||||
],
|
||||
'sort_algorithm' => 'none',
|
||||
],
|
||||
|
|
|
@ -42,6 +42,11 @@ class Controller
|
|||
{
|
||||
use ContainerAware;
|
||||
|
||||
/**
|
||||
* The global configuration object
|
||||
*/
|
||||
public ConfigInterface $config;
|
||||
|
||||
/**
|
||||
* The authentication object
|
||||
*/
|
||||
|
@ -52,11 +57,6 @@ class Controller
|
|||
*/
|
||||
protected CacheInterface $cache;
|
||||
|
||||
/**
|
||||
* The global configuration object
|
||||
*/
|
||||
public ConfigInterface $config;
|
||||
|
||||
/**
|
||||
* Request object
|
||||
*/
|
||||
|
|
|
@ -69,37 +69,6 @@ final class Dispatcher extends RoutingBase
|
|||
$this->outputRoutes = $this->setupRoutes();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current route object, if one matches
|
||||
*/
|
||||
public function getRoute(): Route|false
|
||||
{
|
||||
$logger = $this->container->getLogger();
|
||||
|
||||
$rawRoute = $this->request->getUri()->getPath();
|
||||
$routePath = '/' . trim($rawRoute, '/');
|
||||
|
||||
if ($logger !== NULL)
|
||||
{
|
||||
$logger->info('Dispatcher - Routing data from get_route method');
|
||||
$logger->info(print_r([
|
||||
'route_path' => $routePath,
|
||||
], TRUE));
|
||||
}
|
||||
|
||||
return $this->matcher->match($this->request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get list of routes applied
|
||||
*
|
||||
* @return mixed[]
|
||||
*/
|
||||
public function getOutputRoutes(): array
|
||||
{
|
||||
return $this->outputRoutes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle the current route
|
||||
*
|
||||
|
@ -141,6 +110,37 @@ final class Dispatcher extends RoutingBase
|
|||
$this->call($controllerName, $actionMethod, $params);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current route object, if one matches
|
||||
*/
|
||||
public function getRoute(): Route|false
|
||||
{
|
||||
$logger = $this->container->getLogger();
|
||||
|
||||
$rawRoute = $this->request->getUri()->getPath();
|
||||
$routePath = '/' . trim($rawRoute, '/');
|
||||
|
||||
if ($logger !== NULL)
|
||||
{
|
||||
$logger->info('Dispatcher - Routing data from get_route method');
|
||||
$logger->info(print_r([
|
||||
'route_path' => $routePath,
|
||||
], TRUE));
|
||||
}
|
||||
|
||||
return $this->matcher->match($this->request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get list of routes applied
|
||||
*
|
||||
* @return mixed[]
|
||||
*/
|
||||
public function getOutputRoutes(): array
|
||||
{
|
||||
return $this->outputRoutes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse out the arguments for the appropriate controller for
|
||||
* the current route
|
||||
|
|
|
@ -36,6 +36,19 @@ final class MenuGenerator extends UrlGenerator
|
|||
*/
|
||||
protected ServerRequestInterface $request;
|
||||
|
||||
/**
|
||||
* MenuGenerator constructor.
|
||||
*
|
||||
* @throws ContainerException
|
||||
* @throws NotFoundException
|
||||
*/
|
||||
private function __construct(ContainerInterface $container)
|
||||
{
|
||||
parent::__construct($container);
|
||||
$this->helper = $container->get('html-helper');
|
||||
$this->request = $container->get('request');
|
||||
}
|
||||
|
||||
public static function new(ContainerInterface $container): self
|
||||
{
|
||||
return new self($container);
|
||||
|
@ -80,19 +93,6 @@ final class MenuGenerator extends UrlGenerator
|
|||
return (string) $this->helper->ul();
|
||||
}
|
||||
|
||||
/**
|
||||
* MenuGenerator constructor.
|
||||
*
|
||||
* @throws ContainerException
|
||||
* @throws NotFoundException
|
||||
*/
|
||||
private function __construct(ContainerInterface $container)
|
||||
{
|
||||
parent::__construct($container);
|
||||
$this->helper = $container->get('html-helper');
|
||||
$this->request = $container->get('request');
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate the full menu structure from the config files
|
||||
*
|
||||
|
|
|
@ -20,37 +20,6 @@ use Stringable;
|
|||
|
||||
abstract class AbstractType implements ArrayAccess, Countable, Stringable
|
||||
{
|
||||
/**
|
||||
* Populate values for un-serializing data
|
||||
*/
|
||||
public static function __set_state(mixed $properties): self
|
||||
{
|
||||
return new static($properties);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check the shape of the object, and return the array equivalent
|
||||
*/
|
||||
final public static function check(array $data = []): ?array
|
||||
{
|
||||
$currentClass = static::class;
|
||||
|
||||
if (get_parent_class($currentClass) !== FALSE)
|
||||
{
|
||||
return static::class::from($data)->toArray();
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Static constructor
|
||||
*/
|
||||
final public static function from(mixed $data): static
|
||||
{
|
||||
return new static($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the properties by using the constructor
|
||||
*/
|
||||
|
@ -73,6 +42,14 @@ abstract class AbstractType implements ArrayAccess, Countable, Stringable
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Populate values for un-serializing data
|
||||
*/
|
||||
public static function __set_state(mixed $properties): self
|
||||
{
|
||||
return new static($properties);
|
||||
}
|
||||
|
||||
/**
|
||||
* See if a property is set
|
||||
*/
|
||||
|
@ -123,6 +100,29 @@ abstract class AbstractType implements ArrayAccess, Countable, Stringable
|
|||
return print_r($this, TRUE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check the shape of the object, and return the array equivalent
|
||||
*/
|
||||
final public static function check(array $data = []): ?array
|
||||
{
|
||||
$currentClass = static::class;
|
||||
|
||||
if (get_parent_class($currentClass) !== FALSE)
|
||||
{
|
||||
return static::class::from($data)->toArray();
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Static constructor
|
||||
*/
|
||||
final public static function from(mixed $data): static
|
||||
{
|
||||
return new static($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementing ArrayAccess
|
||||
*/
|
||||
|
|
|
@ -65,14 +65,6 @@ class ArrayType
|
|||
'pop' => 'array_pop',
|
||||
];
|
||||
|
||||
/**
|
||||
* Create an ArrayType wrapper class from an array
|
||||
*/
|
||||
public static function from(array $arr): ArrayType
|
||||
{
|
||||
return new ArrayType($arr);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an ArrayType wrapper class
|
||||
*/
|
||||
|
@ -108,6 +100,14 @@ class ArrayType
|
|||
throw new InvalidArgumentException("Method '{$method}' does not exist");
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an ArrayType wrapper class from an array
|
||||
*/
|
||||
public static function from(array $arr): ArrayType
|
||||
{
|
||||
return new ArrayType($arr);
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the passed key exist in the current array?
|
||||
*/
|
||||
|
|
|
@ -41,7 +41,8 @@ use const MB_CASE_TITLE;
|
|||
/**
|
||||
* Vendored, slightly modernized version of Stringy
|
||||
*/
|
||||
abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
||||
abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess
|
||||
{
|
||||
/**
|
||||
* An instance's string.
|
||||
*/
|
||||
|
@ -84,6 +85,16 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
$this->encoding = $encoding ?: mb_internal_encoding();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the value in $str.
|
||||
*
|
||||
* @return string The current value of the $str property
|
||||
*/
|
||||
public function __toString(): string
|
||||
{
|
||||
return $this->str;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Stringy object and assigns both str and encoding properties
|
||||
* the supplied values. $str is cast to a string prior to assignment, and if
|
||||
|
@ -93,25 +104,15 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
*
|
||||
* @param mixed $str Value to modify, after being cast to string
|
||||
* @param string|null $encoding The character encoding
|
||||
* @return static A Stringy object
|
||||
* @throws InvalidArgumentException if an array or object without a
|
||||
* __toString method is passed as the first argument
|
||||
* @return static A Stringy object
|
||||
*/
|
||||
public static function create(mixed $str = '', ?string $encoding = NULL): self
|
||||
{
|
||||
return new static($str, $encoding);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the value in $str.
|
||||
*
|
||||
* @return string The current value of the $str property
|
||||
*/
|
||||
public function __toString(): string
|
||||
{
|
||||
return $this->str;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a new string with $string appended.
|
||||
*
|
||||
|
@ -813,7 +814,8 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
if ($char === mb_substr($otherStr, $i, 1, $encoding))
|
||||
{
|
||||
$longestCommonPrefix .= $char;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
@ -842,7 +844,8 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
if ($char === mb_substr($otherStr, -$i, 1, $encoding))
|
||||
{
|
||||
$longestCommonSuffix = $char . $longestCommonSuffix;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
@ -898,7 +901,8 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
$len = $table[$i][$j];
|
||||
$end = $i;
|
||||
}
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
$table[$i][$j] = 0;
|
||||
}
|
||||
|
@ -958,9 +962,9 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
* does not exist.
|
||||
*
|
||||
* @param mixed $offset The index from which to retrieve the char
|
||||
* @return string The character at the specified index
|
||||
* @throws OutOfBoundsException If the positive or negative offset does
|
||||
* not exist
|
||||
* @return string The character at the specified index
|
||||
*/
|
||||
public function offsetGet(mixed $offset): string
|
||||
{
|
||||
|
@ -1012,9 +1016,9 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
* @param int $length Desired string length after padding
|
||||
* @param string $padStr String used to pad, defaults to space
|
||||
* @param string $padType One of 'left', 'right', 'both'
|
||||
* @return static Object with a padded $str
|
||||
* @throws /InvalidArgumentException If $padType isn't one of 'right',
|
||||
* 'left' or 'both'
|
||||
* @return static Object with a padded $str
|
||||
*/
|
||||
public function pad(int $length, string $padStr = ' ', string $padType = 'right'): self
|
||||
{
|
||||
|
@ -1359,13 +1363,16 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
if ($end === NULL)
|
||||
{
|
||||
$length = $this->length();
|
||||
} elseif ($end >= 0 && $end <= $start)
|
||||
}
|
||||
elseif ($end >= 0 && $end <= $start)
|
||||
{
|
||||
return static::create('', $this->encoding);
|
||||
} elseif ($end < 0)
|
||||
}
|
||||
elseif ($end < 0)
|
||||
{
|
||||
$length = $this->length() + $end - $start;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
$length = $end - $start;
|
||||
}
|
||||
|
@ -1412,7 +1419,8 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
if ($functionExists)
|
||||
{
|
||||
$array = mb_split($pattern, $this->str, $limit);
|
||||
} elseif ($this->supportsEncoding())
|
||||
}
|
||||
elseif ($this->supportsEncoding())
|
||||
{
|
||||
$array = \preg_split("/{$pattern}/", $this->str, $limit);
|
||||
}
|
||||
|
@ -2024,7 +2032,7 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess {
|
|||
],
|
||||
];
|
||||
|
||||
$charsArray[$language] = isset($languageSpecific[$language]) ? $languageSpecific[$language] : [];
|
||||
$charsArray[$language] = $languageSpecific[$language] ?? [];
|
||||
|
||||
return $charsArray[$language];
|
||||
}
|
||||
|
|
|
@ -3,10 +3,6 @@
|
|||
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
|
||||
use Rector\CodeQuality\Rector\For_\{ForRepeatedCountToOwnVariableRector, ForToForeachRector};
|
||||
use Rector\CodeQuality\Rector\If_\{ConsecutiveNullCompareReturnsToNullCoalesceQueueRector, SimplifyIfElseToTernaryRector, SimplifyIfReturnBoolRector};
|
||||
use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector;
|
||||
use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector;
|
||||
use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
|
||||
use Rector\Set\ValueObject\LevelSetList;
|
||||
use Rector\CodeQuality\Rector\Ternary\{SimplifyTautologyTernaryRector, SwitchNegatedTernaryRector};
|
||||
use Rector\CodingStyle\Rector\ArrowFunction\StaticArrowFunctionRector;
|
||||
use Rector\CodingStyle\Rector\Class_\AddArrayDefaultToArrayPropertyRector;
|
||||
|
@ -19,6 +15,7 @@ use Rector\CodingStyle\Rector\FuncCall\
|
|||
CountArrayToEmptyArrayComparisonRector,
|
||||
VersionCompareFuncCallToConstantRector};
|
||||
use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
|
||||
use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector;
|
||||
use Rector\Config\RectorConfig;
|
||||
use Rector\DeadCode\Rector\ClassMethod\{RemoveUselessParamTagRector, RemoveUselessReturnTagRector};
|
||||
use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
|
||||
|
@ -26,7 +23,10 @@ use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
|
|||
use Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector;
|
||||
use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
|
||||
use Rector\EarlyReturn\Rector\If_\{ChangeIfElseValueAssignToEarlyReturnRector, RemoveAlwaysElseRector};
|
||||
use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector;
|
||||
use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
|
||||
use Rector\PHPUnit\Set\PHPUnitSetList;
|
||||
use Rector\Set\ValueObject\LevelSetList;
|
||||
use Rector\TypeDeclaration\Rector\ClassMethod\{AddMethodCallBasedStrictParamTypeRector, ParamTypeByMethodCallTypeRector, ParamTypeByParentCallTypeRector};
|
||||
use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector;
|
||||
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
|
||||
|
@ -34,7 +34,7 @@ use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
|
|||
return static function (RectorConfig $config): void {
|
||||
// Import names with use statements
|
||||
$config->importNames();
|
||||
$config->importShortClasses(false);
|
||||
$config->importShortClasses(FALSE);
|
||||
|
||||
$config->sets([
|
||||
LevelSetList::UP_TO_PHP_81,
|
||||
|
|
Loading…
Reference in New Issue