Merge branch 'cs' into development

natanfelles · natanfelles · commit e114b25b8d21 · 2023-09-29T06:20:34.000-03:00
# Conflicts:
#	composer.json
diff --git a/composer.json b/composer.json
@@ -63,7 +63,7 @@
     },
     "require-dev": {
         "ext-xdebug": "*",
-        "aplus/coding-standard": "^1.15",
+        "aplus/coding-standard": "^2.0",
         "ergebnis/composer-normalize": "^2.35",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
diff --git a/src/App.php b/src/App.php
@@ -118,7 +118,7 @@ public function __construct(Config | array | string $config = null, bool $debug
         if (isset(static::$config)) {
             throw new LogicException('App already initialized');
         }
-        if ( ! $config instanceof Config) {
+        if (!$config instanceof Config) {
             $config = new Config($config);
         }
         static::$config = $config;
@@ -179,7 +179,7 @@ protected function loadExceptionHandler() : void
         if ($config->getDir() !== null) {
             $exceptionHandlerConfigs ??= $this->loadConfigs('exceptionHandler');
         }
-        if ( ! isset($exceptionHandlerConfigs['default'])) {
+        if (!isset($exceptionHandlerConfigs['default'])) {
             $environment = static::isDebugging()
                 ? ExceptionHandler::DEVELOPMENT
                 : ExceptionHandler::PRODUCTION;
@@ -231,8 +231,8 @@ protected function debugEnd() : void
     {
         static::$debugCollector->setEndTime()->setEndMemory();
         $response = static::router()->getResponse();
-        if ( ! $response->hasDownload()
-            && ! $response->getRequest()->isAjax()
+        if (!$response->hasDownload()
+            && !$response->getRequest()->isAjax()
             && \str_contains(
                 (string) $response->getHeader('Content-Type'),
                 'text/html'
@@ -493,7 +493,7 @@ protected static function addCommand(string $file, Console $console, Locator $lo
         if ($className === null) {
             return false;
         }
-        if ( ! \class_exists($className)) {
+        if (!\class_exists($className)) {
             Isolation::require($file);
         }
         $class = new ReflectionClass($className); // @phpstan-ignore-line
@@ -1037,7 +1037,7 @@ protected static function setRouter(string $instance, array $config = null) : Ro
         if (isset($config['auto_methods']) && $config['auto_methods'] === true) {
             $service->setAutoMethods();
         }
-        if ( ! empty($config['placeholders'])) {
+        if (!empty($config['placeholders'])) {
             $service->addPlaceholder($config['placeholders']);
         }
         if ($requireFiles && isset($config['files'])) {
@@ -1058,7 +1058,7 @@ protected static function setRouter(string $instance, array $config = null) : Ro
     protected static function requireRouterFiles(array $files, Router $router) : void
     {
         foreach ($files as $file) {
-            if ( ! \is_file($file)) {
+            if (!\is_file($file)) {
                 throw new LogicException('Invalid router file: ' . $file);
             }
             Isolation::require($file, ['router' => $router]);
@@ -1166,10 +1166,10 @@ protected static function setResponse(string $instance) : Response
     {
         $config = static::config()->get('response', $instance);
         $service = new Response(static::request($config['request_instance'] ?? 'default'));
-        if ( ! empty($config['headers'])) {
+        if (!empty($config['headers'])) {
             $service->setHeaders($config['headers']);
         }
-        if ( ! empty($config['auto_etag'])) {
+        if (!empty($config['auto_etag'])) {
             $service->setAutoEtag(
                 $config['auto_etag']['active'] ?? true,
                 $config['auto_etag']['hash_algo'] ?? null
diff --git a/src/Debug/AppCollector.php b/src/Debug/AppCollector.php
@@ -31,10 +31,10 @@ class AppCollector extends Collector
     public function setApp(App $app) : static
     {
         $this->app = $app;
-        if ( ! isset($this->startTime)) {
+        if (!isset($this->startTime)) {
             $this->setStartTime();
         }
-        if ( ! isset($this->startMemory)) {
+        if (!isset($this->startMemory)) {
             $this->setStartMemory();
         }
         return $this;
@@ -90,10 +90,10 @@ public function getActivities() : array
 
     public function getContents() : string
     {
-        if ( ! isset($this->endTime)) {
+        if (!isset($this->endTime)) {
             $this->setEndTime(\microtime(true));
         }
-        if ( ! isset($this->endMemory)) {
+        if (!isset($this->endMemory)) {
             $this->setEndMemory(\memory_get_usage());
         }
         \ob_start(); ?>
@@ -161,7 +161,7 @@ protected function getServices() : array
     {
         $result = [];
         foreach ($this->getData() as $data) {
-            if ( ! isset($result[$data['service']])) {
+            if (!isset($result[$data['service']])) {
                 $result[$data['service']] = [];
             }
             $result[$data['service']][] = [
@@ -180,7 +180,7 @@ protected function renderAvailableServices() : string
         $class = new ReflectionClass($this->app);
         $methods = $class->getMethods(ReflectionMethod::IS_STATIC);
         foreach ($methods as $method) {
-            if ( ! $method->isPublic()) {
+            if (!$method->isPublic()) {
                 continue;
             }
             $name = $method->getName();
@@ -196,7 +196,7 @@ protected function renderAvailableServices() : string
                 continue;
             }
             $param = $method->getParameters()[0] ?? null;
-            if ( ! $param || $param->getName() !== 'instance') {
+            if (!$param || $param->getName() !== 'instance') {
                 continue;
             }
             if ($param->getType()?->getName() !== 'string') { // @phpstan-ignore-line
diff --git a/src/Debug/ViewCollector.php b/src/Debug/ViewCollector.php
@@ -73,7 +73,7 @@ public function getContents() : string
 
     protected function renderRenderedViews() : string
     {
-        if ( ! $this->hasData()) {
+        if (!$this->hasData()) {
             return '<p>No view has been rendered.</p>';
         }
         $data = $this->getSortedData();
diff --git a/src/Entity.php b/src/Entity.php
@@ -140,7 +140,7 @@ protected function populate(array $properties) : void
 
     protected function setProperty(string $name, mixed $value) : void
     {
-        if ( ! \property_exists($this, $name)) {
+        if (!\property_exists($this, $name)) {
             throw $this->propertyNotDefined($name);
         }
         if ($value !== null) {
@@ -251,7 +251,7 @@ public function toModel() : array
 
     public function jsonSerialize() : stdClass
     {
-        if ( ! $this->getJsonVars()) {
+        if (!$this->getJsonVars()) {
             return new stdClass();
         }
         $allowed = \array_flip($this->getJsonVars());
@@ -268,7 +268,7 @@ protected function getObjectVars() : array
     {
         $result = [];
         foreach (\get_object_vars($this) as $key => $value) {
-            if ( ! \str_starts_with($key, '_')) {
+            if (!\str_starts_with($key, '_')) {
                 $result[$key] = $value;
             }
         }
diff --git a/src/Model.php b/src/Model.php
@@ -1230,7 +1230,7 @@ public function getValidationMessages() : array
      */
     protected function getValidationRules() : array
     {
-        if ( ! isset($this->validationRules)) {
+        if (!isset($this->validationRules)) {
             throw new RuntimeException('Validation rules are not set');
         }
         return $this->validationRules;
diff --git a/src/Validator.php b/src/Validator.php
@@ -39,7 +39,7 @@ public static function notUnique(
         int | string $ignoreValue = '',
         string $connection = 'default'
     ) : bool {
-        return ! static::unique(
+        return !static::unique(
             $field,
             $data,
             $tableColumn,
@@ -91,7 +91,7 @@ public static function unique(
             ->expressions(['count' => static fn () => 'COUNT(*)'])
             ->from($table)
             ->whereEqual($column, $value);
-        if ($ignoreColumn !== '' && ! \preg_match('#^{(\w+)}$#', $ignoreValue)) {
+        if ($ignoreColumn !== '' && !\preg_match('#^{(\w+)}$#', $ignoreValue)) {
             $statement->whereNotEqual($ignoreColumn, $ignoreValue);
         }
         return $statement->limit(1)->run()->fetch()->count < 1; // @phpstan-ignore-line
diff --git a/src/View.php b/src/View.php
@@ -67,7 +67,7 @@ public function __destruct()
     public function setBaseDir(string $baseDir) : static
     {
         $real = \realpath($baseDir);
-        if ( ! $real || ! \is_dir($real)) {
+        if (!$real || !\is_dir($real)) {
             throw new InvalidArgumentException("View base dir is not a valid directory: {$baseDir} ");
         }
         $this->baseDir = \rtrim($real, '\\/ ') . \DIRECTORY_SEPARATOR;
@@ -151,10 +151,10 @@ protected function getFilepath(string $view) : string
         }
         $view = $this->getBaseDir() . $view . $this->getExtension();
         $real = \realpath($view);
-        if ( ! $real || ! \is_file($real)) {
+        if (!$real || !\is_file($real)) {
             throw new InvalidArgumentException("View path does not match a file: {$view}");
         }
-        if ($this->getBaseDir() && ! \str_starts_with($real, $this->getBaseDir())) {
+        if ($this->getBaseDir() && !\str_starts_with($real, $this->getBaseDir())) {
             throw new InvalidArgumentException("View path out of base directory: {$real}");
         }
         return $real;
@@ -258,7 +258,7 @@ public function endBlock() : static
             echo \PHP_EOL . '<!-- Block end: ' . $block . ' -->' . \PHP_EOL;
         }
         $contents = \ob_get_clean();
-        if ( ! isset($this->blocks[$name])) {
+        if (!isset($this->blocks[$name])) {
             $this->blocks[$name] = $contents; // @phpstan-ignore-line
         }
         return $this;
@@ -373,7 +373,7 @@ protected function getContents(string $view, array $data) : string
         $data['view'] = $this;
         \ob_start();
         Isolation::require($this->getFilepath($view), $data);
-        if (isset($this->openBlock) && ! $this->inInclude) {
+        if (isset($this->openBlock) && !$this->inInclude) {
             $this->openBlock = null;
             $this->endBlock();
         }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function __construct(Config \| array \| string $config = null, bool $debug`
`118`	`118`	`if (isset(static::$config)) {`
`119`	`119`	`throw new LogicException('App already initialized');`
`120`	`120`	`}`
`121`		`- if ( ! $config instanceof Config) {`
	`121`	`+ if (!$config instanceof Config) {`
`122`	`122`	`$config = new Config($config);`
`123`	`123`	`}`
`124`	`124`	`static::$config = $config;`
`@@ -179,7 +179,7 @@ protected function loadExceptionHandler() : void`
`179`	`179`	`if ($config->getDir() !== null) {`
`180`	`180`	`$exceptionHandlerConfigs ??= $this->loadConfigs('exceptionHandler');`
`181`	`181`	`}`
`182`		`- if ( ! isset($exceptionHandlerConfigs['default'])) {`
	`182`	`+ if (!isset($exceptionHandlerConfigs['default'])) {`
`183`	`183`	`$environment = static::isDebugging()`
`184`	`184`	`? ExceptionHandler::DEVELOPMENT`
`185`	`185`	`: ExceptionHandler::PRODUCTION;`
`@@ -231,8 +231,8 @@ protected function debugEnd() : void`
`231`	`231`	`{`
`232`	`232`	`static::$debugCollector->setEndTime()->setEndMemory();`
`233`	`233`	`$response = static::router()->getResponse();`
`234`		`- if ( ! $response->hasDownload()`
`235`		`- && ! $response->getRequest()->isAjax()`
	`234`	`+ if (!$response->hasDownload()`
	`235`	`+ && !$response->getRequest()->isAjax()`
`236`	`236`	`&& \str_contains(`
`237`	`237`	`(string) $response->getHeader('Content-Type'),`
`238`	`238`	`'text/html'`
`@@ -493,7 +493,7 @@ protected static function addCommand(string $file, Console $console, Locator $lo`
`493`	`493`	`if ($className === null) {`
`494`	`494`	`return false;`
`495`	`495`	`}`
`496`		`- if ( ! \class_exists($className)) {`
	`496`	`+ if (!\class_exists($className)) {`
`497`	`497`	`Isolation::require($file);`
`498`	`498`	`}`
`499`	`499`	`$class = new ReflectionClass($className); // @phpstan-ignore-line`
`@@ -1037,7 +1037,7 @@ protected static function setRouter(string $instance, array $config = null) : Ro`
`1037`	`1037`	`if (isset($config['auto_methods']) && $config['auto_methods'] === true) {`
`1038`	`1038`	`$service->setAutoMethods();`
`1039`	`1039`	`}`
`1040`		`- if ( ! empty($config['placeholders'])) {`
	`1040`	`+ if (!empty($config['placeholders'])) {`
`1041`	`1041`	`$service->addPlaceholder($config['placeholders']);`
`1042`	`1042`	`}`
`1043`	`1043`	`if ($requireFiles && isset($config['files'])) {`
`@@ -1058,7 +1058,7 @@ protected static function setRouter(string $instance, array $config = null) : Ro`
`1058`	`1058`	`protected static function requireRouterFiles(array $files, Router $router) : void`
`1059`	`1059`	`{`
`1060`	`1060`	`foreach ($files as $file) {`
`1061`		`- if ( ! \is_file($file)) {`
	`1061`	`+ if (!\is_file($file)) {`
`1062`	`1062`	`throw new LogicException('Invalid router file: ' . $file);`
`1063`	`1063`	`}`
`1064`	`1064`	`Isolation::require($file, ['router' => $router]);`
`@@ -1166,10 +1166,10 @@ protected static function setResponse(string $instance) : Response`
`1166`	`1166`	`{`
`1167`	`1167`	`$config = static::config()->get('response', $instance);`
`1168`	`1168`	`$service = new Response(static::request($config['request_instance'] ?? 'default'));`
`1169`		`- if ( ! empty($config['headers'])) {`
	`1169`	`+ if (!empty($config['headers'])) {`
`1170`	`1170`	`$service->setHeaders($config['headers']);`
`1171`	`1171`	`}`
`1172`		`- if ( ! empty($config['auto_etag'])) {`
	`1172`	`+ if (!empty($config['auto_etag'])) {`
`1173`	`1173`	`$service->setAutoEtag(`
`1174`	`1174`	`$config['auto_etag']['active'] ?? true,`
`1175`	`1175`	`$config['auto_etag']['hash_algo'] ?? null`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ class AppCollector extends Collector`
`31`	`31`	`public function setApp(App $app) : static`
`32`	`32`	`{`
`33`	`33`	`$this->app = $app;`
`34`		`- if ( ! isset($this->startTime)) {`
	`34`	`+ if (!isset($this->startTime)) {`
`35`	`35`	`$this->setStartTime();`
`36`	`36`	`}`
`37`		`- if ( ! isset($this->startMemory)) {`
	`37`	`+ if (!isset($this->startMemory)) {`
`38`	`38`	`$this->setStartMemory();`
`39`	`39`	`}`
`40`	`40`	`return $this;`
`@@ -90,10 +90,10 @@ public function getActivities() : array`
`90`	`90`
`91`	`91`	`public function getContents() : string`
`92`	`92`	`{`
`93`		`- if ( ! isset($this->endTime)) {`
	`93`	`+ if (!isset($this->endTime)) {`
`94`	`94`	`$this->setEndTime(\microtime(true));`
`95`	`95`	`}`
`96`		`- if ( ! isset($this->endMemory)) {`
	`96`	`+ if (!isset($this->endMemory)) {`
`97`	`97`	`$this->setEndMemory(\memory_get_usage());`
`98`	`98`	`}`
`99`	`99`	`\ob_start(); ?>`
`@@ -161,7 +161,7 @@ protected function getServices() : array`
`161`	`161`	`{`
`162`	`162`	`$result = [];`
`163`	`163`	`foreach ($this->getData() as $data) {`
`164`		`- if ( ! isset($result[$data['service']])) {`
	`164`	`+ if (!isset($result[$data['service']])) {`
`165`	`165`	`$result[$data['service']] = [];`
`166`	`166`	`}`
`167`	`167`	`$result[$data['service']][] = [`
`@@ -180,7 +180,7 @@ protected function renderAvailableServices() : string`
`180`	`180`	`$class = new ReflectionClass($this->app);`
`181`	`181`	`$methods = $class->getMethods(ReflectionMethod::IS_STATIC);`
`182`	`182`	`foreach ($methods as $method) {`
`183`		`- if ( ! $method->isPublic()) {`
	`183`	`+ if (!$method->isPublic()) {`
`184`	`184`	`continue;`
`185`	`185`	`}`
`186`	`186`	`$name = $method->getName();`
`@@ -196,7 +196,7 @@ protected function renderAvailableServices() : string`
`196`	`196`	`continue;`
`197`	`197`	`}`
`198`	`198`	`$param = $method->getParameters()[0] ?? null;`
`199`		`- if ( ! $param \|\| $param->getName() !== 'instance') {`
	`199`	`+ if (!$param \|\| $param->getName() !== 'instance') {`
`200`	`200`	`continue;`
`201`	`201`	`}`
`202`	`202`	`if ($param->getType()?->getName() !== 'string') { // @phpstan-ignore-line`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function getContents() : string`
`73`	`73`
`74`	`74`	`protected function renderRenderedViews() : string`
`75`	`75`	`{`
`76`		`- if ( ! $this->hasData()) {`
	`76`	`+ if (!$this->hasData()) {`
`77`	`77`	`return '<p>No view has been rendered.</p>';`
`78`	`78`	`}`
`79`	`79`	`$data = $this->getSortedData();`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ protected function populate(array $properties) : void`
`140`	`140`
`141`	`141`	`protected function setProperty(string $name, mixed $value) : void`
`142`	`142`	`{`
`143`		`- if ( ! \property_exists($this, $name)) {`
	`143`	`+ if (!\property_exists($this, $name)) {`
`144`	`144`	`throw $this->propertyNotDefined($name);`
`145`	`145`	`}`
`146`	`146`	`if ($value !== null) {`
`@@ -251,7 +251,7 @@ public function toModel() : array`
`251`	`251`
`252`	`252`	`public function jsonSerialize() : stdClass`
`253`	`253`	`{`
`254`		`- if ( ! $this->getJsonVars()) {`
	`254`	`+ if (!$this->getJsonVars()) {`
`255`	`255`	`return new stdClass();`
`256`	`256`	`}`
`257`	`257`	`$allowed = \array_flip($this->getJsonVars());`
`@@ -268,7 +268,7 @@ protected function getObjectVars() : array`
`268`	`268`	`{`
`269`	`269`	`$result = [];`
`270`	`270`	`foreach (\get_object_vars($this) as $key => $value) {`
`271`		`- if ( ! \str_starts_with($key, '_')) {`
	`271`	`+ if (!\str_starts_with($key, '_')) {`
`272`	`272`	`$result[$key] = $value;`
`273`	`273`	`}`
`274`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1230,7 +1230,7 @@ public function getValidationMessages() : array`
`1230`	`1230`	`*/`
`1231`	`1231`	`protected function getValidationRules() : array`
`1232`	`1232`	`{`
`1233`		`- if ( ! isset($this->validationRules)) {`
	`1233`	`+ if (!isset($this->validationRules)) {`
`1234`	`1234`	`throw new RuntimeException('Validation rules are not set');`
`1235`	`1235`	`}`
`1236`	`1236`	`return $this->validationRules;`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function __destruct()`
`67`	`67`	`public function setBaseDir(string $baseDir) : static`
`68`	`68`	`{`
`69`	`69`	`$real = \realpath($baseDir);`
`70`		`- if ( ! $real \|\| ! \is_dir($real)) {`
	`70`	`+ if (!$real \|\| !\is_dir($real)) {`
`71`	`71`	`throw new InvalidArgumentException("View base dir is not a valid directory: {$baseDir} ");`
`72`	`72`	`}`
`73`	`73`	`$this->baseDir = \rtrim($real, '\\/ ') . \DIRECTORY_SEPARATOR;`
`@@ -151,10 +151,10 @@ protected function getFilepath(string $view) : string`
`151`	`151`	`}`
`152`	`152`	`$view = $this->getBaseDir() . $view . $this->getExtension();`
`153`	`153`	`$real = \realpath($view);`
`154`		`- if ( ! $real \|\| ! \is_file($real)) {`
	`154`	`+ if (!$real \|\| !\is_file($real)) {`
`155`	`155`	`throw new InvalidArgumentException("View path does not match a file: {$view}");`
`156`	`156`	`}`
`157`		`- if ($this->getBaseDir() && ! \str_starts_with($real, $this->getBaseDir())) {`
	`157`	`+ if ($this->getBaseDir() && !\str_starts_with($real, $this->getBaseDir())) {`
`158`	`158`	`throw new InvalidArgumentException("View path out of base directory: {$real}");`
`159`	`159`	`}`
`160`	`160`	`return $real;`
`@@ -258,7 +258,7 @@ public function endBlock() : static`
`258`	`258`	`echo \PHP_EOL . '<!-- Block end: ' . $block . ' -->' . \PHP_EOL;`
`259`	`259`	`}`
`260`	`260`	`$contents = \ob_get_clean();`
`261`		`- if ( ! isset($this->blocks[$name])) {`
	`261`	`+ if (!isset($this->blocks[$name])) {`
`262`	`262`	`$this->blocks[$name] = $contents; // @phpstan-ignore-line`
`263`	`263`	`}`
`264`	`264`	`return $this;`
`@@ -373,7 +373,7 @@ protected function getContents(string $view, array $data) : string`
`373`	`373`	`$data['view'] = $this;`
`374`	`374`	`\ob_start();`
`375`	`375`	`Isolation::require($this->getFilepath($view), $data);`
`376`		`- if (isset($this->openBlock) && ! $this->inInclude) {`
	`376`	`+ if (isset($this->openBlock) && !$this->inInclude) {`
`377`	`377`	`$this->openBlock = null;`
`378`	`378`	`$this->endBlock();`
`379`	`379`	`}`