Merge branch 'development'

natanfelles · natanfelles · commit af68245d2934 · 2023-12-06T16:03:01.000-03:00
diff --git a/.editorconfig b/.editorconfig
@@ -8,7 +8,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{md, rst}]
+[*.{md,rst}]
 trim_trailing_whitespace = false
 
 [*.yml]
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
           vendor/bin/phpstan analyse -vvv
 
       - name: PHPUnit
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
       - name: Upload coverage results to Coveralls
         env:
@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: true
 
-    name: PHP 8.2 - Last
+    name: PHP Latest
 
     steps:
       - name: Checkout
@@ -77,7 +77,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: latest
           tools: composer
           coverage: xdebug
 
@@ -88,4 +88,4 @@ jobs:
           composer update
 
       - name: PHPUnit
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ build/
 raw-tests/
 vendor/
 .php-cs-fixer.cache
+.phpunit.cache
 .phpunit.result.cache
 composer.lock
 composer.phar
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -30,8 +30,8 @@ test:php:
       - build/docs/
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
 
-test:php-last:
-  image: registry.gitlab.com/aplus-framework/images/base:3
+test:php-latest:
+  image: registry.gitlab.com/aplus-framework/images/base:latest
   stage: test
   timeout: 10 minutes
   cache:
diff --git a/composer.json b/composer.json
@@ -39,12 +39,12 @@
     },
     "require-dev": {
         "ext-xdebug": "*",
-        "aplus/coding-standard": "^1.14",
+        "aplus/coding-standard": "^2.1",
         "ergebnis/composer-normalize": "^2.25",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^1.7",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,9 +7,9 @@ services:
     volumes:
       - .:/package
     tty: true
-  package-last:
-    image: registry.gitlab.com/aplus-framework/images/package:3
-    container_name: package-cli-last
+  package-latest:
+    image: registry.gitlab.com/aplus-framework/images/package:latest
+    container_name: package-cli-latest
     working_dir: /package
     volumes:
       - .:/package
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
-         bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false"
-         stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
+         bootstrap="vendor/autoload.php" colors="true" stopOnError="false" stopOnFailure="false"
+         stopOnIncomplete="false" stopOnSkipped="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
+    <coverage>
         <report>
             <clover outputFile="build/coverage/clover.xml"/>
             <html outputDirectory="build/coverage"/>
@@ -21,4 +18,9 @@
     <php>
         <const name="TESTING" value="true"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/CLI.php b/src/CLI.php
@@ -371,7 +371,7 @@ public static function getWidth(int $default = 80) : int
             return $default;
         }
         $width = (int) \shell_exec('tput cols');
-        if ( ! $width) {
+        if (!$width) {
             return $default;
         }
         return $width;
@@ -509,7 +509,7 @@ public static function liveLine(string $text, bool $finalize = false) : void
     {
         // See: https://stackoverflow.com/a/35190285
         $string = '';
-        if ( ! static::isWindows()) {
+        if (!static::isWindows()) {
             $string .= "\33[2K";
         }
         $string .= "\r";
@@ -548,7 +548,7 @@ public static function box(
     ) : void {
         $width = static::getWidth();
         $width -= 2;
-        if ( ! \is_array($lines)) {
+        if (!\is_array($lines)) {
             $lines = [
                 $lines,
             ];
@@ -688,7 +688,7 @@ public static function table(array $tbody, array $thead = []) : void
         // All the rows in the table will be here until the end
         $tableRows = [];
         // We need only indexes and not keys
-        if ( ! empty($thead)) {
+        if (!empty($thead)) {
             $tableRows[] = \array_values($thead);
         }
         foreach ($tbody as $tr) {
@@ -712,7 +712,7 @@ public static function table(array $tbody, array $thead = []) : void
                 // If the current column does not have a value among the larger ones
                 // or the value of this is greater than the existing one
                 // then, now, this assumes the maximum length
-                if ( ! isset($maxColsLengths[$column])
+                if (!isset($maxColsLengths[$column])
                     || $allColsLengths[$row][$column] > $maxColsLengths[$column]) {
                     $maxColsLengths[$column] = $allColsLengths[$row][$column];
                 }
@@ -746,7 +746,7 @@ public static function table(array $tbody, array $thead = []) : void
             // Set the vertical borders
             $table .= '| ' . \implode(' | ', $value) . ' |' . \PHP_EOL;
             // Set the thead and table borders-bottom
-            if (($row === 0 && ! empty($thead)) || $row + 1 === $totalRows) {
+            if (($row === 0 && !empty($thead)) || $row + 1 === $totalRows) {
                 $table .= $line . \PHP_EOL;
             }
         }
diff --git a/src/Commands/Index.php b/src/Commands/Index.php
@@ -116,11 +116,11 @@ protected function getUser() : string
             return $this->console->getLanguage()->render('cli', 'friend');
         }
         $info = \posix_getpwnam($username);
-        if ( ! $info) {
+        if (!$info) {
             return $username;
         }
         $gecos = $info['gecos'] ?? '';
-        if ( ! $gecos) {
+        if (!$gecos) {
             return $username;
         }
         $length = \strpos($gecos, ',') ?: \strlen($gecos);
diff --git a/src/Console.php b/src/Console.php
@@ -197,7 +197,7 @@ public function getCommands() : array
     {
         $commands = $this->commands;
         foreach ($commands as $name => $command) {
-            if ( ! $command->isActive()) {
+            if (!$command->isActive()) {
                 unset($commands[$name]);
             }
         }
@@ -349,7 +349,7 @@ public static function commandToArgs(string $command) : array
         $inSQuote = false;
         for ($i = 0; $i < $charCount; $i++) {
             $char = $command[$i];
-            if ($char === ' ' && ! $inDQuote && ! $inSQuote) {
+            if ($char === ' ' && !$inDQuote && !$inSQuote) {
                 if ($arg !== '') {
                     $argv[] = $arg;
                 }
@@ -364,11 +364,11 @@ public static function commandToArgs(string $command) : array
                 $inDQuote = false;
                 continue;
             }
-            if ($char === '"' && ! $inSQuote) {
+            if ($char === '"' && !$inSQuote) {
                 $inDQuote = true;
                 continue;
             }
-            if ($char === "'" && ! $inDQuote) {
+            if ($char === "'" && !$inDQuote) {
                 $inSQuote = true;
                 continue;
             }

Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,11 @@ protected function getUser() : string`
`116`	`116`	`return $this->console->getLanguage()->render('cli', 'friend');`
`117`	`117`	`}`
`118`	`118`	`$info = \posix_getpwnam($username);`
`119`		`- if ( ! $info) {`
	`119`	`+ if (!$info) {`
`120`	`120`	`return $username;`
`121`	`121`	`}`
`122`	`122`	`$gecos = $info['gecos'] ?? '';`
`123`		`- if ( ! $gecos) {`
	`123`	`+ if (!$gecos) {`
`124`	`124`	`return $username;`
`125`	`125`	`}`
`126`	`126`	`$length = \strpos($gecos, ',') ?: \strlen($gecos);`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public function getCommands() : array`
`197`	`197`	`{`
`198`	`198`	`$commands = $this->commands;`
`199`	`199`	`foreach ($commands as $name => $command) {`
`200`		`- if ( ! $command->isActive()) {`
	`200`	`+ if (!$command->isActive()) {`
`201`	`201`	`unset($commands[$name]);`
`202`	`202`	`}`
`203`	`203`	`}`
`@@ -349,7 +349,7 @@ public static function commandToArgs(string $command) : array`
`349`	`349`	`$inSQuote = false;`
`350`	`350`	`for ($i = 0; $i < $charCount; $i++) {`
`351`	`351`	`$char = $command[$i];`
`352`		`- if ($char === ' ' && ! $inDQuote && ! $inSQuote) {`
	`352`	`+ if ($char === ' ' && !$inDQuote && !$inSQuote) {`
`353`	`353`	`if ($arg !== '') {`
`354`	`354`	`$argv[] = $arg;`
`355`	`355`	`}`
`@@ -364,11 +364,11 @@ public static function commandToArgs(string $command) : array`
`364`	`364`	`$inDQuote = false;`
`365`	`365`	`continue;`
`366`	`366`	`}`
`367`		`- if ($char === '"' && ! $inSQuote) {`
	`367`	`+ if ($char === '"' && !$inSQuote) {`
`368`	`368`	`$inDQuote = true;`
`369`	`369`	`continue;`
`370`	`370`	`}`
`371`		`- if ($char === "'" && ! $inDQuote) {`
	`371`	`+ if ($char === "'" && !$inDQuote) {`
`372`	`372`	`$inSQuote = true;`
`373`	`373`	`continue;`
`374`	`374`	`}`