Benzine/Core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

php-cs-fixer update.

Browse source
This commit is contained in:
Greyscale 2024-04-14 15:48:14 +02:00
parent 41bba407a9
commit a3b9a49fec
56 changed files with 355 additions and 318 deletions

38
.php-cs-fixer.php
View file

@ -41,17 +41,35 @@ return (new PhpCsFixer\Config)
->setRiskyAllowed(true)
->setHideProgress(false)
->setRules([
'@PSR2' => true,
'strict_param' => true,
'array_syntax' => ['syntax' => 'short'],
'@PhpCsFixer' => true,
'@PHP73Migration' => true,
'no_php4_constructor' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_superfluous_phpdoc_tags' => false,
'void_return' => true,
'yoda_style' => false,
// '@PhpCsFixer:risky' => true,
'@PHP82Migration' => true,
'@PHP80Migration:risky' => true,
'@PSR12' => true,
'@PSR12:risky' => true,
'@PHPUnit100Migration:risky' => true,
'binary_operator_spaces' => [
'default' => 'align_single_space_minimal',
'operators' => [
'=' => 'align_single_space',
'=>' => 'align_single_space',
],
],
'types_spaces' => [
'space' => 'single',
'space_multiple_catch' => 'single',
],
// Annoyance-fixers:
'concat_space' => ['spacing' => 'one'], // This one is a matter of taste.
'no_superfluous_phpdoc_tags' => [
'allow_mixed' => false,
'allow_unused_params' => false,
'remove_inheritdoc' => true,
],
'yoda_style' => false, // Disabled as its annoying. Comes with @PhpCsFixer
'native_function_invocation' => false, // Disabled as adding count($i) -> \count($i) is annoying, but supposedly more performant
])
->setFinder($finder)
;

6
bin/find-autoloader.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
function detectAndLoadVendor($path = __DIR__): void
{
$path = realpath($path);
@ -11,12 +13,12 @@ function detectAndLoadVendor($path = __DIR__): void
if ($fileInfo->isDir() && 'vendor' == $fileInfo->getFilename()) {
define('VENDOR_PATH', $fileInfo->getRealPath());
require_once VENDOR_PATH.'/autoload.php';
require_once VENDOR_PATH . '/autoload.php';
return;
}
}
detectAndLoadVendor($path.'/../');
detectAndLoadVendor($path . '/../');
}
detectAndLoadVendor();

1
src/Annotations/JsonSchema.php
View file

@ -8,7 +8,6 @@ use Doctrine\Common\Annotations\Annotation\Required;
/**
* @Annotation
*
* @Target("METHOD")
*/
class JsonSchema

5
src/Annotations/Route.php
View file

@ -8,12 +8,10 @@ use Doctrine\Common\Annotations\Annotation\Required;
/**
* @Annotation
*
* @Target("METHOD")
*/
class Route
{
/** @var array */
public array $methods = ['GET'];
/**
@ -21,12 +19,9 @@ class Route
*/
public string $path;
/** @var string */
public string $access = \Benzine\Router\Route::ACCESS_PUBLIC;
/** @var int */
public int $weight = 100;
/** @var array */
public array $domains = [];
}

65
src/App.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine;
use Benzine\Middleware\JsonResponseExecTimeMiddleware;
@ -31,7 +33,10 @@ use DebugBar\DebugBar;
use DI\Container;
use DI\ContainerBuilder;
use Faker\Factory as FakerFactory;
use Faker\Generator;
use Faker\Provider;
use Kint\Twig\TwigExtension;
use Middlewares\ContentLength;
use Middlewares\TrailingSlash;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler;
@ -57,7 +62,7 @@ class App
protected EnvironmentService $environmentService;
protected ConfigurationService $configurationService;
protected \Slim\App $app;
protected Slim\App $app;
protected Logger $logger;
protected DebugBar $debugBar;
protected Router $router;
@ -65,8 +70,8 @@ class App
protected bool $interrogateControllersComplete = false;
protected ?CachePoolChain $cachePoolChain = null;
private array $viewPaths = [];
private string $cachePath = APP_ROOT.'/cache';
private string $logPath = APP_ROOT.'/logs';
private string $cachePath = APP_ROOT . '/cache';
private string $logPath = APP_ROOT . '/logs';
private array $supportedLanguages = ['en_US'];
private bool $debugMode = false;
@ -74,10 +79,6 @@ class App
public function __construct()
{
if (!ini_get('auto_detect_line_endings')) {
ini_set('auto_detect_line_endings', '1');
}
// Configure Dependency Injector
$container = $this->setupContainer();
$this->logger = $container->get(Logger::class);
@ -91,8 +92,8 @@ class App
}
// Configure default expected views paths
$this->viewPaths[] = APP_ROOT.'/views/';
$this->viewPaths[] = APP_ROOT.'/src/Views/';
$this->viewPaths[] = APP_ROOT . '/views/';
$this->viewPaths[] = APP_ROOT . '/src/Views/';
// Configure Slim
$this->app = AppFactory::create();
@ -132,19 +133,11 @@ class App
return $this;
}
/**
* @return array
*/
public function getViewPaths(): array
{
return $this->viewPaths;
}
/**
* @param array $viewPaths
*
* @return App
*/
public function setViewPaths(array $viewPaths): App
{
$this->viewPaths = $viewPaths;
@ -152,19 +145,11 @@ class App
return $this;
}
/**
* @return string
*/
public function getLogPath(): string
{
return $this->logPath;
}
/**
* @param string $logPath
*
* @return App
*/
public function setLogPath(string $logPath): App
{
$this->logPath = $logPath;
@ -215,7 +200,7 @@ class App
if (!(new Filesystem())->exists($twigCachePath)) {
try {
(new Filesystem())->mkdir($twigCachePath, 0777);
(new Filesystem())->mkdir($twigCachePath, 0o777);
} catch (IOException $IOException) {
unset($twigSettings['cache']);
if (!in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
@ -245,7 +230,7 @@ class App
$twig->addExtension(new Twig\Extension\DebugExtension());
// Add Twig extension to integrate Kint
$twig->addExtension(new \Kint\Twig\TwigExtension());
$twig->addExtension(new TwigExtension());
// Add Twig extension to check if something is an instance of a known class or entity
$twig->addExtension(new Extensions\InstanceOfExtension());
@ -267,9 +252,7 @@ class App
});
// This is required as some plugins for Slim expect there to be a twig available as "view"
$container->set('view', function (Slim\Views\Twig $twig) {
return $twig;
});
$container->set('view', fn (Slim\Views\Twig $twig) => $twig);
$container->set(Translation\Translator::class, function (SessionService $sessionService) {
$selectedLanguage = $sessionService->has('Language') ? $sessionService->get('Language') : 'en_US';
@ -286,7 +269,7 @@ class App
$translator->addLoader('yaml', $yamlLoader);
// add some resources to the translator
$translator->addResource('yaml', APP_ROOT."/src/Strings/{$selectedLanguage}.yaml", $selectedLanguage);
$translator->addResource('yaml', APP_ROOT . "/src/Strings/{$selectedLanguage}.yaml", $selectedLanguage);
return $translator;
});
@ -298,7 +281,7 @@ class App
);
});
$container->set(\Faker\Generator::class, function () {
$container->set(Generator::class, function () {
$faker = FakerFactory::create();
$faker->addProvider(new Provider\Base($faker));
$faker->addProvider(new Provider\DateTime($faker));
@ -339,7 +322,7 @@ class App
$container->set('MonologFormatter', function (EnvironmentService $environmentService) {
return new LineFormatter(
// the default output format is "[%datetime%] %channel%.%level_name%: %message% %context% %extra%"
$environmentService->get('MONOLOG_FORMAT', '[%datetime%] %channel%.%level_name%: %message% %context% %extra%')."\n",
$environmentService->get('MONOLOG_FORMAT', '[%datetime%] %channel%.%level_name%: %message% %context% %extra%') . "\n",
'Y n j, g:i a'
);
});
@ -365,7 +348,7 @@ class App
$cliFormatter = new ColoredLineFormatter(
new TrafficLight(),
// the default output format is "[%datetime%] %channel%.%level_name%: %message% %context% %extra%"
$environmentService->get('MONOLOG_FORMAT', '[%datetime%] %level_name%: %message%')."\n",
$environmentService->get('MONOLOG_FORMAT', '[%datetime%] %level_name%: %message%') . "\n",
'g:i'
);
$cliHandler->setFormatter($cliFormatter);
@ -392,9 +375,7 @@ class App
);
});
$container->set(TrailingSlash::class, function () {
return (new TrailingSlash())->redirect();
});
$container->set(TrailingSlash::class, fn () => (new TrailingSlash())->redirect());
$container->set(DebugBar::class, function (Logger $logger) {
return (new DebugBar())
@ -414,7 +395,7 @@ class App
);
});
$this->environmentService = $container->get(Services\EnvironmentService::class);
$this->environmentService = $container->get(EnvironmentService::class);
if ($this->environmentService->has('TIMEZONE')) {
date_default_timezone_set($this->environmentService->get('TIMEZONE'));
} elseif ((new Filesystem())->exists('/etc/timezone')) {
@ -434,11 +415,11 @@ class App
// Middlewares
$this->app->addBodyParsingMiddleware();
// $this->app->add($container->get(\Middlewares\Geolocation::class));
$this->app->add($container->get(\Middlewares\TrailingSlash::class));
$this->app->add($container->get(TrailingSlash::class));
// $this->app->add($container->get(\Middlewares\Whoops::class));
// $this->app->add($container->get(\Middlewares\Minifier::class));
// $this->app->add($container->get(\Middlewares\GzipEncoder::class));
$this->app->add($container->get(\Middlewares\ContentLength::class));
$this->app->add($container->get(ContentLength::class));
}
/**
@ -586,7 +567,7 @@ class App
protected function interrogateTranslations(): void
{
$stringPath = APP_ROOT.'/src/Strings';
$stringPath = APP_ROOT . '/src/Strings';
if (!(new Filesystem())->exists($stringPath)) {
return;
}
@ -615,7 +596,7 @@ class App
$appClass = new \ReflectionClass(static::class);
$this->router->loadRoutesFromAnnotations(
[
APP_ROOT.'/src/Controllers',
APP_ROOT . '/src/Controllers',
],
$appClass->getNamespaceName()
);

9
src/Controllers/AbstractController.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Controllers;
use Benzine\Controllers\Filters\Filter;
@ -17,8 +19,7 @@ abstract class AbstractController
public function __construct(
protected Logger $logger,
protected CacheProvider $cacheProvider
) {
}
) {}
public function xmlResponse(\SimpleXMLElement $root, Request $request, Response $response): Response
{
@ -69,7 +70,7 @@ abstract class AbstractController
return true;
}
throw new FilterDecodeException('Could not decode given Filter. Reason: Not JSON. Given: "'.$filterText.'"');
throw new FilterDecodeException('Could not decode given Filter. Reason: Not JSON. Given: "' . $filterText . '"');
}
}
@ -103,7 +104,7 @@ abstract class AbstractController
}
// Generate an etag
$etag = md5($filesystem->lastModified($filename).$filename);
$etag = md5($filesystem->lastModified($filename) . $filename);
$response = $this->cacheProvider->withEtag($response, $etag);
// Detect mimetype for content-type header from file meta

2
src/Controllers/AbstractCrudController.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Controllers;
use Benzine\ORM\Interfaces\ModelInterface;

2
src/Controllers/AbstractHTMLController.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Controllers;
use DebugBar\DebugBar;

26
src/Controllers/Filters/Filter.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Controllers\Filters;
use Benzine\Exceptions\FilterDecodeException;
@ -20,8 +22,6 @@ class Filter
/**
* @throws FilterDecodeException
*
* @return Filter
*/
public function setOrderDirection(string $orderDirection): self
{
@ -34,8 +34,6 @@ class Filter
}
/**
* @param $header
*
* @throws FilterDecodeException
*/
public function parseFromHeader($header): self
@ -75,11 +73,6 @@ class Filter
return $this->limit;
}
/**
* @param mixed $limit
*
* @return Filter
*/
public function setLimit($limit): self
{
$this->limit = $limit;
@ -92,11 +85,6 @@ class Filter
return $this->offset;
}
/**
* @param mixed $offset
*
* @return Filter
*/
public function setOffset($offset): self
{
$this->offset = $offset;
@ -109,11 +97,6 @@ class Filter
return $this->wheres;
}
/**
* @param mixed $wheres
*
* @return Filter
*/
public function setWheres($wheres): self
{
$this->wheres = $wheres;
@ -126,11 +109,6 @@ class Filter
return $this->order;
}
/**
* @param mixed $order
*
* @return Filter
*/
public function setOrder($order): self
{
$this->order = $order;

2
src/Controllers/Filters/FilterCondition.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Controllers\Filters;
class FilterCondition

6
src/Exceptions/BenzineConfigurationException.php
View file

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Exceptions;
class BenzineConfigurationException extends BenzineException
{
}
class BenzineConfigurationException extends BenzineException {}

6
src/Exceptions/BenzineException.php
View file

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Exceptions;
class BenzineException extends \Exception
{
}
class BenzineException extends \Exception {}

6
src/Exceptions/DbConfigException.php
View file

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Exceptions;
class DbConfigException extends BenzineException
{
}
class DbConfigException extends BenzineException {}

6
src/Exceptions/DbRuntimeException.php
View file

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Exceptions;
class DbRuntimeException extends BenzineException
{
}
class DbRuntimeException extends BenzineException {}

6
src/Exceptions/FilterDecodeException.php
View file

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Exceptions;
class FilterDecodeException extends BenzineException
{
}
class FilterDecodeException extends BenzineException {}

4
src/Exceptions/JsonErrorHandler.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Exceptions;
use Slim\Interfaces\ErrorRendererInterface;
@ -10,7 +12,7 @@ class JsonErrorHandler implements ErrorRendererInterface
{
return json_encode([
'error' => $exception->getMessage(),
'where' => $exception->getFile().':'.$exception->getLine(),
'where' => $exception->getFile() . ':' . $exception->getLine(),
'code' => $exception->getCode(),
], JSON_PRETTY_PRINT);
}

6
src/Exceptions/WorkerException.php
View file

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Exceptions;
class WorkerException extends BenzineException
{
}
class WorkerException extends BenzineException {}

5
src/Guzzle/JsonResponse.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Guzzle;
use Psr\Http\Message\ResponseInterface;
@ -9,8 +11,7 @@ class JsonResponse implements ResponseInterface
{
public function __construct(
protected ResponseInterface $response
) {
}
) {}
public function json()
{

2
src/Middleware/JsonResponseExecTimeMiddleware.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Middleware;
use Psr\Http\Message\ResponseInterface;

3
src/Middleware/JsonValidationMiddleware.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Middleware;
use Benzine\Annotations\JsonSchema;
@ -49,6 +51,7 @@ class JsonValidationMiddleware implements MiddlewareInterface
try {
// Validate it...
$schema->in(json_decode($request->getBody()->getContents()));
// And if we get here, we're golden.
return $handler->handle($request);
} catch (Exception $exception) {

2
src/Models/Traits/AuthableTrait.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Models\Traits;
use Carbon\Carbon;

2
src/Redis/Lua/AbstractLuaExtension.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Redis\Lua;
use Benzine\Redis\Redis;

2
src/Redis/Lua/SetIfHigher.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Redis\Lua;
class SetIfHigher extends AbstractLuaExtension

2
src/Redis/Lua/SetIfLower.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Redis\Lua;
class SetIfLower extends AbstractLuaExtension

2
src/Redis/Lua/ZAddIfHigher.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Redis\Lua;
class ZAddIfHigher extends AbstractLuaExtension

2
src/Redis/Lua/ZAddIfLower.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Redis\Lua;
class ZAddIfLower extends AbstractLuaExtension

4
src/Redis/Redis.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Redis;
use Monolog\Logger;
@ -230,7 +232,7 @@ class Redis
/** @var Lua\AbstractLuaExtension[] */
private array $scripts;
public function __construct(Logger $logger, string $host, int $port = 6379, string $password = null, float $timeout = 0.0)
public function __construct(Logger $logger, string $host, int $port = 6379, ?string $password = null, float $timeout = 0.0)
{
$this->logger = $logger;

13
src/Router/Route.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Router;
use Slim\App;
@ -49,7 +51,6 @@ class Route
}
/**
* @param $name
* @param null $default
*
* @return $this
@ -109,8 +110,6 @@ class Route
}
/**
* @param mixed $propertyOptions
*
* @return Route
*/
public function setPropertyOptions($propertyOptions)
@ -322,8 +321,6 @@ class Route
}
/**
* @param mixed $exampleEntity
*
* @return Route
*/
public function setExampleEntity($exampleEntity)
@ -339,8 +336,6 @@ class Route
}
/**
* @param mixed $exampleEntityFinderFunction
*
* @return Route
*/
public function setExampleEntityFinderFunction($exampleEntityFinderFunction)
@ -389,7 +384,7 @@ class Route
return count($this->validDomains) > 0;
}
public function isInContainedInValidDomains(string $host = null): bool
public function isInContainedInValidDomains(?string $host = null): bool
{
if (null === $host) {
return false;
@ -413,7 +408,7 @@ class Route
private function prefixArgumentKey(string $key)
{
if (0 !== strpos($key, '_')) {
if (!str_starts_with($key, '_')) {
$key = "_{$key}";
}

20
src/Router/Router.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Router;
use Cache\Adapter\Chain\CachePoolChain;
@ -28,7 +30,7 @@ class Router
public function loadRoutesFromAnnotations(
array $controllerPaths,
string $baseNamespace = null
?string $baseNamespace = null
): void {
AnnotationRegistry::registerLoader('class_exists');
@ -46,8 +48,8 @@ class Router
foreach ($phpFiles as $controllerFile) {
$fileClassName = ltrim(str_replace([$controllerPath, '/', '.php'], ['', '\\', ''], $controllerFile[0]), '\\');
$expectedClasses = [
$baseNamespace.'\\Controllers\\'.$fileClassName,
'Benzine\\Controllers\\'.$fileClassName,
$baseNamespace . '\\Controllers\\' . $fileClassName,
'Benzine\\Controllers\\' . $fileClassName,
];
foreach ($expectedClasses as $expectedClass) {
@ -82,8 +84,8 @@ class Router
$newRoute
->setHttpMethod($httpMethod)
->setRouterPattern('/'.ltrim($routeAnnotation->path, '/'))
->setCallback($expectedClass.':'.$method->name)
->setRouterPattern('/' . ltrim($routeAnnotation->path, '/'))
->setCallback($expectedClass . ':' . $method->name)
->setWeight($routeAnnotation->weight)
;
@ -101,7 +103,7 @@ class Router
}
}
public function populateRoutes(App $app, ServerRequestInterface $request = null): App
public function populateRoutes(App $app, ?ServerRequestInterface $request = null): App
{
if ($this->routesArePopulated) {
return $app;
@ -168,13 +170,13 @@ class Router
$this->cachePoolChain->save($routeItem);
// $this->logger->info('Cached router to cache pool');
} catch (CachePoolException $cachePoolException) {
$this->logger->critical('Cache Pool Exception: '.$cachePoolException->getMessage());
$this->logger->critical('Cache Pool Exception: ' . $cachePoolException->getMessage());
}
return $this;
}
protected function weighRoutes(string $host = null): self
protected function weighRoutes(?string $host = null): self
{
$allocatedRoutes = [];
if (is_array($this->routes) && count($this->routes) > 0) {
@ -189,7 +191,7 @@ class Router
});
foreach ($this->routes as $index => $route) {
$routeKey = $route->getHttpMethod().$route->getRouterPattern();
$routeKey = $route->getHttpMethod() . $route->getRouterPattern();
if (!isset($allocatedRoutes[$routeKey]) && ($route->isInContainedInValidDomains($host) || !$route->hasValidDomains())) {
$allocatedRoutes[$routeKey] = true;
} else {

12
src/Services/ConfigurationService.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Services;
use Benzine\App;
@ -30,7 +32,7 @@ class ConfigurationService
{
$this->app = $app;
$this->environmentService = $environmentService;
$this->findConfig();
$this->findConfig($this->environmentService->get('BENZINE_CONFIG_PATH', null));
$this->setupDefines();
}
@ -42,7 +44,7 @@ class ConfigurationService
/**
* @return null|array|string
*/
public function get(string $key, string $defaultValue = null)
public function get(string $key, ?string $defaultValue = null)
{
$scope = $this->config;
foreach (explode('/', strtolower($key)) as $keyBit) {
@ -101,14 +103,14 @@ class ConfigurationService
/**
* Locate .benzine.yml.
*/
protected function findConfig(string $path = null): bool
protected function findConfig(?string $path = null): bool
{
if (!$path) {
$path = getcwd();
// $path = dirname($this->environmentService->get('SCRIPT_FILENAME'));
}
if (!(new Filesystem())->exists($path.'/.benzine.yml')) {
if (!(new Filesystem())->exists($path . '/.benzine.yml')) {
$this->configNotFoundInPaths[] = $path;
$currentDirElem = explode(DIRECTORY_SEPARATOR, $path);
array_pop($currentDirElem);
@ -125,7 +127,7 @@ class ConfigurationService
));
}
$this->parseFile($path.'/.benzine.yml');
$this->parseFile($path . '/.benzine.yml');
$this->appRoot = $path;
return true;

4
src/Services/EnvironmentService.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Services;
class EnvironmentService
@ -24,7 +26,7 @@ class EnvironmentService
return $this->environmentVariables;
}
public function get(string $key, string $default = null)
public function get(string $key, ?string $default = null)
{
if (isset($this->environmentVariables[$key])) {
return $this->environmentVariables[$key];

2
src/Services/QueueService.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Services;
use Benzine\Redis\Redis;

16
src/Services/SessionService.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Services;
use Benzine\Redis\Redis;
@ -87,8 +89,8 @@ class SessionService implements \SessionHandlerInterface
public function read($session_id)
{
if ($this->useAPCU()) {
if (apcu_exists('read-'.$session_id)) {
return apcu_fetch('read-'.$session_id);
if (apcu_exists('read-' . $session_id)) {
return apcu_fetch('read-' . $session_id);
}
}
@ -110,9 +112,9 @@ class SessionService implements \SessionHandlerInterface
}
if ($this->useAPCU()) {
apcu_store('read-'.$session_id, $result, 30);
apcu_store('read-' . $session_id, $result, 30);
} else {
$this->dirtyCheck['read-'.$session_id] = crc32($result);
$this->dirtyCheck['read-' . $session_id] = crc32($result);
}
return $result;
@ -127,9 +129,9 @@ class SessionService implements \SessionHandlerInterface
public function write($session_id, $session_data): bool
{
if ($this->useAPCU()) {
$dirty = crc32(apcu_fetch('read-'.$session_id)) != crc32($session_data);
$dirty = crc32(apcu_fetch('read-' . $session_id)) != crc32($session_data);
} else {
$dirty = $this->dirtyCheck['read-'.$session_id] != crc32($session_data);
$dirty = $this->dirtyCheck['read-' . $session_id] != crc32($session_data);
}
if ($this->useRedis() && $dirty) {
@ -138,7 +140,7 @@ class SessionService implements \SessionHandlerInterface
}
if ($this->useAPCU()) {
apcu_store('read-'.$session_id, $session_data);
apcu_store('read-' . $session_id, $session_data);
}
return true;

2
src/Twig/Extensions/ArrayUniqueTwigExtension.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Twig\Extensions;
use Twig\Extension\AbstractExtension;

2
src/Twig/Extensions/ArrayValuesTwigExtension.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Twig\Extensions;
use Twig\Extension\AbstractExtension;

2
src/Twig/Extensions/FilterAlphanumericOnlyTwigExtension.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Twig\Extensions;
use Twig\Extension\AbstractExtension;

10
src/Twig/Extensions/InflectionExtension.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Twig\Extensions;
use MatthewBaggett\Inflection\Inflect;
@ -11,12 +13,8 @@ class InflectionExtension extends AbstractExtension
public function getFilters()
{
$filters = [];
$filters['pluralize'] = new TwigFilter('pluralize', function (string $word = null): string {
return !empty($word) ? Inflect::pluralize($word) : '';
});
$filters['singularize'] = new TwigFilter('singularize', function (string $word = null): string {
return !empty($word) ? Inflect::singularize($word) : '';
});
$filters['pluralize'] = new TwigFilter('pluralize', fn (?string $word = null): string => !empty($word) ? Inflect::pluralize($word) : '');
$filters['singularize'] = new TwigFilter('singularize', fn (?string $word = null): string => !empty($word) ? Inflect::singularize($word) : '');
return $filters;
}

2
src/Twig/Extensions/InstanceOfExtension.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Twig\Extensions;
use Twig\Extension\AbstractExtension;

8
src/Twig/Extensions/TransformExtension.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Twig\Extensions;
use Camel\CaseTransformer;
@ -22,12 +24,10 @@ class TransformExtension extends AbstractExtension
$filters = [];
foreach ($this->transformers as $fromTransformer) {
foreach ($this->transformers as $toTransformer) {
$name = 'transform_'.strtolower($fromTransformer).'_to_'.strtolower($toTransformer);
$name = 'transform_' . strtolower($fromTransformer) . '_to_' . strtolower($toTransformer);
$context = $this;
$filters[$name] =
new TwigFilter($name, function (string $word) use ($context, $fromTransformer, $toTransformer): string {
return $context->transform($word, $fromTransformer, $toTransformer);
});
new TwigFilter($name, fn (string $word): string => $context->transform($word, $fromTransformer, $toTransformer));
}
}

6
src/Twig/Extensions/TransformExtensionException.php
View file

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Twig\Extensions;
final class TransformExtensionException extends \Exception
{
}
final class TransformExtensionException extends \Exception {}

2
src/Workers/AbstractForeverLoopWorker.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Workers;
abstract class AbstractForeverLoopWorker extends AbstractWorker implements WorkerInterface

2
src/Workers/AbstractQueueWorker.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Workers;
use Benzine\Services\EnvironmentService;

9
src/Workers/AbstractWorker.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Workers;
use Benzine\Services\EnvironmentService;
@ -27,13 +29,8 @@ abstract class AbstractWorker implements WorkerInterface
);
}
protected function setUp(): void
{
}
protected function setUp(): void {}
/**
* @param bool $stopOnZero
*/
public function setStopOnZero(bool $stopOnZero): self
{
$this->stopOnZero = $stopOnZero;

2
src/Workers/ExampleQueueWorker.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Workers;
class ExampleQueueWorker extends AbstractQueueWorker

2
src/Workers/WaitForEmitWorker.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Workers;
use Benzine\Redis\Redis;

2
src/Workers/WorkerInterface.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Workers;
interface WorkerInterface

7
src/Workers/WorkerWorkItem.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Workers;
use Benzine\Exceptions\WorkerException;
@ -40,7 +42,7 @@ class WorkerWorkItem implements \Serializable
public static function Factory(object $object)
{
$class = get_class($object);
$class = $object::class;
return (new WorkerWorkItem())
->setKey($class, $object)
@ -52,9 +54,6 @@ class WorkerWorkItem implements \Serializable
return $this->data;
}
/**
* @return WorkerWorkItem
*/
public function setData(array $data): self
{
$this->data = $data;

8
tests/AbstractBaseTestCase.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests;
use Faker\Factory as FakerFactory;
@ -55,7 +57,7 @@ abstract class AbstractBaseTestCase extends AbstractTestCase
*/
public function invokeMethod(&$object, $methodName, array $parameters = [])
{
$reflection = new \ReflectionClass(get_class($object));
$reflection = new \ReflectionClass($object::class);
$method = $reflection->getMethod($methodName);
$method->setAccessible(true);
@ -64,7 +66,7 @@ abstract class AbstractBaseTestCase extends AbstractTestCase
public function setProtectedProperty(&$object, $property, $value)
{
$reflection = new \ReflectionClass(get_class($object));
$reflection = new \ReflectionClass($object::class);
$prop = $reflection->getProperty($property);
$prop->setAccessible(true);
@ -73,7 +75,7 @@ abstract class AbstractBaseTestCase extends AbstractTestCase
public function getProtectedProperty(&$object, $property)
{
$reflection = new \ReflectionClass(get_class($object));
$reflection = new \ReflectionClass($object::class);
$prop = $reflection->getProperty($property);
$prop->setAccessible(true);

2
tests/AbstractRoutesTestCase.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests;
use Benzine\Tests\Traits\AppTestTrait;

8
tests/AbstractSeleniumTestCase.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests;
use Benzine\App;
@ -40,7 +42,7 @@ abstract class AbstractSeleniumTestCase extends AbstractBaseTestCase
self::$webDriver->manage()->timeouts()->implicitlyWait(3);
self::$screenshotsDir = APP_ROOT.'/build/Screenshots/'.date('Y-m-d H-i-s').'/';
self::$screenshotsDir = APP_ROOT . '/build/Screenshots/' . date('Y-m-d H-i-s') . '/';
}
public static function tearDownAfterClass(): void
@ -68,9 +70,9 @@ abstract class AbstractSeleniumTestCase extends AbstractBaseTestCase
protected function takeScreenshot($name): void
{
if (!(new Filesystem())->exists(self::$screenshotsDir)) {
(new Filesystem())->mkdir(self::$screenshotsDir, 0777);
(new Filesystem())->mkdir(self::$screenshotsDir, 0o777);
}
self::$webDriver->takeScreenshot(self::$screenshotsDir.self::$screenshotIndex."_{$name}.jpg");
self::$webDriver->takeScreenshot(self::$screenshotsDir . self::$screenshotIndex . "_{$name}.jpg");
++self::$screenshotIndex;
}
}

4
tests/AbstractTestCase.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests;
use PHPUnit\Framework\TestCase;
@ -27,7 +29,7 @@ abstract class AbstractTestCase extends TestCase
parent::tearDown();
if (defined('DEBUG') && DEBUG) {
$time = microtime(true) - $this->singleTestTime;
echo ''.get_called_class().':'.$this->getName().': Took '.number_format($time, 3)." seconds\n\n";
echo '' . get_called_class() . ':' . $this->getName() . ': Took ' . number_format($time, 3) . " seconds\n\n";
}
}

8
tests/Traits/AppTestTrait.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests\Traits;
use Benzine\App as BenzineApp;
@ -30,7 +32,7 @@ trait AppTestTrait
*/
protected function setupContainer(): void
{
$this->benzineApp = require __DIR__.'/../../../../../bootstrap.php';
$this->benzineApp = require __DIR__ . '/../../../../../bootstrap.php';
$this->slimApp = $this->benzineApp->getApp();
$container = $this->slimApp->getContainer();
@ -98,7 +100,7 @@ trait AppTestTrait
* @param string|UriInterface $uri The URI
* @param null|array $data The json data
*/
protected function createJsonRequest(string $method, $uri, array $data = null): ServerRequestInterface
protected function createJsonRequest(string $method, $uri, ?array $data = null): ServerRequestInterface
{
$request = $this->createRequest($method, $uri);
@ -116,7 +118,7 @@ trait AppTestTrait
* @param string|UriInterface $uri The URI
* @param null|array $data The form data
*/
protected function createFormRequest(string $method, $uri, array $data = null): ServerRequestInterface
protected function createFormRequest(string $method, $uri, ?array $data = null): ServerRequestInterface
{
$request = $this->createRequest($method, $uri);

2
tests/Traits/ArrayEquitabilityTrait.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests\Traits;
trait ArrayEquitabilityTrait

2
tests/Traits/DatabaseAccessTrait.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests\Traits;
use Slim\Container;

2
tests/Traits/FakeDataTrait.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests\Traits;
use Faker\Factory as FakerFactory;

8
tests/Traits/OverrideProtectionTrait.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Benzine\Tests\Traits;
trait OverrideProtectionTrait
@ -15,7 +17,7 @@ trait OverrideProtectionTrait
*/
public function invokeMethod(&$object, $methodName, array $parameters = [])
{
$reflection = new \ReflectionClass(get_class($object));
$reflection = new \ReflectionClass($object::class);
$method = $reflection->getMethod($methodName);
$method->setAccessible(true);
@ -24,7 +26,7 @@ trait OverrideProtectionTrait
public function setProtectedProperty(&$object, $property, $value)
{
$reflection = new \ReflectionClass(get_class($object));
$reflection = new \ReflectionClass($object::class);
$prop = $reflection->getProperty($property);
$prop->setAccessible(true);
@ -33,7 +35,7 @@ trait OverrideProtectionTrait
public function getProtectedProperty(&$object, $property)
{
$reflection = new \ReflectionClass(get_class($object));
$reflection = new \ReflectionClass($object::class);
$prop = $reflection->getProperty($property);
$prop->setAccessible(true);