PHP 8.2, Framework 2.0

BGSU-LITS · Dec 18, 2023 · b3f180f · b3f180f
1 parent 755b213
commit b3f180f
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 77 deletions.
diff --git a/composer.json b/composer.json
@@ -10,15 +10,16 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^8.2",
         "ext-PDO": "*",
-        "bgsu-lits/framework": "^1.9.0",
+        "bgsu-lits/framework": "^2.0",
         "latitude/latitude": "^4.2",
-        "lulco/phoenix": "^1.10",
-        "pagerfanta/pagerfanta": "^3.5",
-        "phpoffice/phpspreadsheet": "^1.20",
-        "slim/http": "^1.2",
-        "slim/slim": "^4.9"
+        "lulco/phoenix": "^2.5",
+        "pagerfanta/pagerfanta": "^4.2",
+        "phpoffice/phpspreadsheet": "^1.29",
+        "slim/http": "^1.1",
+        "slim/slim": "^4.12",
+        "thecodingmachine/safe": "^2.5"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.3",
@@ -49,7 +50,7 @@
         "scripts-dev": {
             "phpcbf": "phpcbf ./ --standard=phpcs.xml",
             "phpcs": "phpcs ./ --standard=phpcs.xml",
-            "phplint": "phplint ./ --exclude=vendor",
+            "phplint": "phplint ./ -c phplint.yml",
             "phpstan": "phpstan analyse -c phpstan.neon",
             "phpunit": "phpunit -c phpunit.xml",
             "psalm": "psalm --config=psalm.xml",

diff --git a/migration.template b/migration.template
@@ -5,7 +5,7 @@ declare(strict_types=1);
 ###NAMESPACE###use Phoenix\Exception\InvalidArgumentValueException;
 use Phoenix\Migration\AbstractMigration;
 
-class ###CLASSNAME### extends AbstractMigration
+final class ###CLASSNAME### extends AbstractMigration
 {
 ###INDENT###/** @throws InvalidArgumentValueException */
 ###INDENT###protected function up(): void

diff --git a/phoenix.php b/phoenix.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Lits\Database;
+use Lits\Framework;
 
 $path = getcwd();
 
@@ -14,10 +15,10 @@
     return [];
 }
 
-/** @var \Lits\Framework $framework */
 $framework = require $path;
+assert($framework instanceof Framework);
 
-/** @var \Lits\Database $database */
 $database = $framework->container()->get(Database::class);
+assert($database instanceof Database);
 
 return $database->migration();
diff --git a/phplint.yml b/phplint.yml
@@ -0,0 +1 @@
+vendor/bgsu-lits/framework/phplint.yml
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
+    cacheResultFile="cache/phpunit.result"
 >
     <coverage processUncoveredFiles="true">
         <include>

diff --git a/src/Lits/Action/DatabaseFileTrait.php b/src/Lits/Action/DatabaseFileTrait.php
@@ -16,7 +16,7 @@
 
 trait DatabaseFileTrait
 {
-    /** @return mixed[][] */
+    /** @return array<array<mixed>> */
     abstract protected function file(): array;
 
     /**
@@ -26,14 +26,14 @@ abstract protected function file(): array;
     public function csv(
         ServerRequest $request,
         Response $response,
-        array $data
+        array $data,
     ): Response {
         return $this->writeFile(
             $request,
             $response,
             $data,
             'csv',
-            'text/csv; charset=UTF-8'
+            'text/csv; charset=UTF-8',
         );
     }
 
@@ -44,20 +44,21 @@ public function csv(
     public function xlsx(
         ServerRequest $request,
         Response $response,
-        array $data
+        array $data,
     ): Response {
         return $this->writeFile(
             $request,
             $response,
             $data,
             'xlsx',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            'application/vnd.openxmlformats-' .
+            'officedocument.spreadsheetml.sheet',
         );
     }
 
     public static function addFileRoutes(
         RouteCollectorProxy $router,
-        string $path
+        string $path,
     ): void {
         $path = \trim($path, '/');
 
@@ -76,7 +77,7 @@ private function writeFile(
         Response $response,
         array $data,
         string $extension,
-        string $contentType
+        string $contentType,
     ): Response {
         $this->setup($request, $response, $data);
 
@@ -85,7 +86,7 @@ private function writeFile(
         if ($stream === false) {
             throw new HttpInternalServerErrorException(
                 $this->request,
-                'Could not open memory stream'
+                'Could not open memory stream',
             );
         }
 
@@ -99,13 +100,13 @@ private function writeFile(
             throw new HttpInternalServerErrorException(
                 $this->request,
                 'Could not create download file',
-                $exception
+                $exception,
             );
         }
 
         $name = \strtolower(
             \implode('_', \array_slice($this->hierarchy(), 1)) . '.' .
-            $extension
+            $extension,
         );
 
         try {
@@ -116,7 +117,7 @@ private function writeFile(
             throw new HttpInternalServerErrorException(
                 $this->request,
                 'Could not download file',
-                $exception
+                $exception,
             );
         }
     }
@@ -140,7 +141,7 @@ private function writeFileSpreadsheet(): Spreadsheet
                         $col,
                         $row,
                         $file_col,
-                        DataType::TYPE_STRING
+                        DataType::TYPE_STRING,
                     );
 
                 $col++;

diff --git a/src/Lits/Adapter/PaginationAdapter.php b/src/Lits/Adapter/PaginationAdapter.php
@@ -13,23 +13,20 @@
 use function Latitude\QueryBuilder\func;
 
 /** @implements Adapter<array<array-key, mixed>> */
-class PaginationAdapter implements Adapter
+final class PaginationAdapter implements Adapter
 {
-    private Database $database;
-    private SelectQuery $query;
-
-    public function __construct(Database $database, SelectQuery $query)
-    {
-        $this->database = $database;
-        $this->query = $query;
+    public function __construct(
+        private Database $database,
+        private SelectQuery $query,
+    ) {
     }
 
     public function getNbResults(): int
     {
         $statement = $this->database->execute(
             $this->database->query
                 ->select(func('count', '*'))
-                ->from(alias(express('(%s)', $this->query), 'query'))
+                ->from(alias(express('(%s)', $this->query), 'query')),
         );
 
         $count = (int) $statement->fetchColumn();
@@ -47,10 +44,10 @@ public function getSlice(int $offset, int $length): iterable
         $statement = $this->database->execute(
             $this->query
                 ->offset($offset)
-                ->limit($length)
+                ->limit($length),
         );
 
-        /** @var array<array-key, array<array-key, mixed>>|false */
+        /** @var array<array-key, array<array-key, mixed>>|false $slice */
         $slice = $statement->fetchAll(\PDO::FETCH_ASSOC);
 
         if (\is_array($slice)) {

diff --git a/src/Lits/Config/DatabaseConfig.php b/src/Lits/Config/DatabaseConfig.php
@@ -23,31 +23,31 @@ public function testSettings(): void
     {
         if (!\in_array($this->type, ['mysql', 'pgsql'], true)) {
             throw new InvalidConfigException(
-                'The database type must be mysql or pgsql'
+                'The database type must be mysql or pgsql',
             );
         }
 
         if ($this->host === '') {
             throw new InvalidConfigException(
-                'The database host must be specified'
+                'The database host must be specified',
             );
         }
 
         if ($this->username === '') {
             throw new InvalidConfigException(
-                'The database username must be specified'
+                'The database username must be specified',
             );
         }
 
         if ($this->password === '') {
             throw new InvalidConfigException(
-                'The database password must be specified'
+                'The database password must be specified',
             );
         }
 
         if ($this->name === '') {
             throw new InvalidConfigException(
-                'The database name must be specified'
+                'The database name must be specified',
             );
         }
     }

diff --git a/src/Lits/Data/DatabaseData.php b/src/Lits/Data/DatabaseData.php
@@ -12,13 +12,11 @@
 
 abstract class DatabaseData extends Data
 {
-    protected Database $database;
-
-    public function __construct(Settings $settings, Database $database)
-    {
+    public function __construct(
+        Settings $settings,
+        protected Database $database,
+    ) {
         parent::__construct($settings);
-
-        $this->database = $database;
     }
 
     /**
@@ -27,7 +25,7 @@ public function __construct(Settings $settings, Database $database)
      */
     protected static function findRowDatetime(
         array $row,
-        string $key
+        string $key,
     ): ?DateTimeImmutable {
         if (isset($row[$key])) {
             try {
@@ -36,7 +34,7 @@ protected static function findRowDatetime(
                 throw new InvalidDataException(
                     'The string could not be parsed into a datetime',
                     0,
-                    $exception
+                    $exception,
                 );
             }
         }