Strict types update

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: VitexSoftware
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/copilot-instructions.md

@@ -0,0 +1,43 @@
+<!-- Use this file to provide workspace-specific custom instructions to Copilot. For more details, visit https://code.visualstudio.com/docs/copilot/copilot-customization#_use-a-githubcopilotinstructionsmd-file -->
+
+All code comments should be written in English.
+
+All messages, including error messages, should be written in English.
+
+All code should be written in PHP 8.4 or later.
+
+All code should follow the PSR-12 coding standard.
+
+When writing code, always include a docblock for functions and classes, describing their purpose, parameters, and return types.
+
+When writing tests, use PHPUnit and follow the PSR-12 coding standard.
+
+When writing documentation, use MarkDown format.
+
+When writing commit messages, use the imperative mood and keep them concise.
+
+When writing code comments, use complete sentences and proper grammar.
+
+When writing code, always use meaningful variable names that describe their purpose.
+
+When writing code, avoid using magic numbers or strings; instead, define constants for them.
+
+When writing code, always handle exceptions properly and provide meaningful error messages.
+
+When writing code, always include type hints for function parameters and return types.
+
+We are using the i18n library for internationalization, so always use the _() functions for strings that need to be translated.
+
+When writing code, always ensure that it is secure and does not expose any sensitive information.
+
+When writing code, always consider performance and optimize where necessary.
+
+When writing code, always ensure that it is compatible with the latest version of PHP and the libraries we are using.
+
+When writing code, always ensure that it is well-tested and includes unit tests where applicable.
+
+When writing code, always ensure that it is maintainable and follows best practices.
+
+When create new class or update existing class, always create or update its phpunit test files.
+
+After every single edit to a PHP file, always run `php -l` on the edited file to lint it and ensure code sanity before proceeding further. This is mandatory for all PHP code changes.

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    versioning-strategy: increase
+    commit-message:
+      prefix: "composer"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/testing.yml

@@ -0,0 +1,21 @@
+name: PHPUnit
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+      env: 
+        DEBIAN_FRONTEND: "noninteractive"
+        LC_ALL: "en_US.UTF-8"
+        LANG: "en_US.UTF-8"
+    - name: Prepare Environment
+      run: |
+        sudo apt-get install -y composer exim4
+        composer update
+    - name: Run tests
+      run: make phpunit

.gitignore

@@ -1,2 +1,9 @@
 /.idea/
 /vendor/
+debian/php-vitexsoftware-fluentpdo.debhelper.log
+debian/.debhelper/
+debian/php-vitexsoftware-fluentpdo/
+debian/debhelper-build-stamp
+debian/php-vitexsoftware-fluentpdo.substvars
+nbproject/
+.build/

.php-cs-fixer.dist.php

@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of the FluentPDO package.
+ *
+ * FluentPDO is a quick and light PHP library for rapid query building. It features a smart join builder, which automatically creates table joins.
+ *
+ * For more information see readme.md
+ *
+ * @link      https://github.com/VitexSoftware/fluentpdo
+ * @author    Chris Bornhoft, start@env.ms
+ * @copyright 2012-2020 envms - Chris Bornhoft, Marek Lichtner
+ * @license   https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License, version 3.0
+ *
+ * (G) 2025-2026 Vítězslav Dvořák <info@vitexsoftware.cz>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Ergebnis\PhpCsFixer\Config\Factory;
+use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet\Php81;
+
+$header = <<<'HEADER'
+This file is part of the FluentPDO package.
+
+FluentPDO is a quick and light PHP library for rapid query building. It features a smart join builder, which automatically creates table joins.
+
+For more information see readme.md
+
+@link      https://github.com/VitexSoftware/fluentpdo
+@author    Chris Bornhoft, start@env.ms
+@copyright 2012-2020 envms - Chris Bornhoft, Marek Lichtner
+@license   https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License, version 3.0
+
+(G) 2025-2026 Vítězslav Dvořák <info@vitexsoftware.cz>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+HEADER;
+
+$ruleSet = Php81::create()->withHeader($header)->withRules(Rules::fromArray([
+    'blank_line_before_statement' => [
+        'statements' => [
+            'break',
+            'continue',
+            'declare',
+            'default',
+            'do',
+            'exit',
+            'for',
+            'foreach',
+            'goto',
+            'if',
+            'include',
+            'include_once',
+            'require',
+            'require_once',
+            'return',
+            'switch',
+            'throw',
+            'try',
+            'while',
+        ],
+    ],
+    'concat_space' => [
+        'spacing' => 'none',
+    ],
+    'date_time_immutable' => false,
+    'error_suppression' => false,
+    'final_class' => false,
+    'mb_str_functions' => false,
+    'native_function_invocation' => [
+        'exclude' => [
+            'sprintf',
+        ],
+        'include' => [
+            '@compiler_optimized',
+        ],
+        'scope' => 'all',
+        'strict' => false,
+    ],
+    'php_unit_internal_class' => false,
+    'php_unit_test_annotation' => [
+        'style' => 'prefix',
+    ],
+    'php_unit_test_class_requires_covers' => false,
+    'return_to_yield_from' => false,
+    'phpdoc_array_type' => false,
+    'phpdoc_list_type' => false,
+    'attribute_empty_parentheses' => false,
+    'final_public_method_for_abstract_class' => false,
+    'class_attributes_separation' => [
+        'elements' => [
+            'const' => 'only_if_meta',
+            'property' => 'only_if_meta',
+            'trait_import' => 'none',
+            'case' => 'none',
+        ],
+    ],
+    'yoda_style' => false,
+    'php_unit_test_case_static_method_calls' => false,
+]));
+
+$config = Factory::fromRuleSet($ruleSet)->setUnsupportedPhpVersionAllowed(true);
+
+$config->getFinder()
+    ->append([
+        __DIR__.'/.php-cs-fixer.dist.php',
+    ])
+    ->append([
+        __DIR__.'/rector.php',
+    ])
+    ->in('src')
+    ->in('tests');
+
+$config->setCacheFile(__DIR__.'/.build/php-cs-fixer/.php-cs-fixer.cache');
+
+return $config;

.vscode/settings.json

@@ -0,0 +1,23 @@
+{
+    "php.version": "8.2",
+    "workbench.colorCustomizations": {
+        "activityBar.activeBackground": "#225d9c",
+        "activityBar.background": "#225d9c",
+        "activityBar.foreground": "#e7e7e7",
+        "activityBar.inactiveForeground": "#e7e7e799",
+        "activityBarBadge.background": "#dd629d",
+        "activityBarBadge.foreground": "#15202b",
+        "commandCenter.border": "#e7e7e799",
+        "sash.hoverBorder": "#225d9c",
+        "statusBar.background": "#194472",
+        "statusBar.foreground": "#e7e7e7",
+        "statusBarItem.hoverBackground": "#225d9c",
+        "statusBarItem.remoteBackground": "#194472",
+        "statusBarItem.remoteForeground": "#e7e7e7",
+        "titleBar.activeBackground": "#194472",
+        "titleBar.activeForeground": "#e7e7e7",
+        "titleBar.inactiveBackground": "#19447299",
+        "titleBar.inactiveForeground": "#e7e7e799"
+    },
+    "peacock.color": "#194472"
+}

AGENTS.md

@@ -0,0 +1,99 @@
+# AGENTS.md
+
+This file provides guidance to WARP (warp.dev) when working with code in this repository.
+
+## Project Overview
+
+FluentPDO - PHP 8.1+ Edition is a modernized fork of the original FluentPDO project. It's a PHP SQL query builder library using PDO with a smart join builder that automatically creates table joins. This version (3.x) requires PHP 8.1+ and includes modern type declarations, strict typing, and enhanced features.
+
+## Common Development Commands
+
+### Testing
+```bash
+# Run all tests
+phpunit --configuration phpunit.xml
+
+# Install dependencies first if needed
+composer install
+
+# Set up test database (for local development)
+mysql -u $DB_USER < tests/_resources/fluentdb.sql
+```
+
+### Development Setup
+```bash
+# Install dependencies
+composer install
+
+# For testing, you need a MySQL database named 'fluentdb'
+# Check tests/_resources/init.php for database configuration
+```
+
+## Code Architecture
+
+### Core Classes Structure
+- `Query` - Main entry point, creates query objects (SELECT, INSERT, UPDATE, DELETE)
+- `Structure` - Handles table relationships, primary/foreign key conventions
+- `Base` - Abstract base class for all query types, handles execution and parameters
+- `Common` - Shared functionality for SELECT/UPDATE/DELETE queries (WHERE, JOIN clauses)
+
+### Query Types (src/Queries/)
+- `Select` - SELECT query builder with smart joins, implements Countable
+- `Insert` - INSERT query builder  
+- `Update` - UPDATE query builder
+- `Delete` - DELETE query builder
+- `Json` - JSON query support
+
+### Key Features
+- **Smart Join Builder**: Automatically creates JOINs based on column references (e.g., `user.name` auto-joins user table)
+- **Fluent Interface**: Method chaining for building queries
+- **PDO Integration**: Built on top of PDO for database portability
+- **Type Conversion**: Optional type conversion for read/write operations
+
+### Database Conventions
+- Primary keys default to 'id' 
+- Foreign keys follow pattern '%s_id' (e.g., `user_id` for user table)
+- These conventions can be customized via `Structure` class
+
+### Usage Patterns
+```php
+// Basic setup
+$fluent = new \Envms\FluentPDO\Query($pdo);
+
+// Smart joins automatically created
+$query = $fluent->from('comment')
+    ->where('article.published_at > ?', $date)  // Auto-joins article table
+    ->orderBy('published_at DESC');
+
+// Shorthand methods for single-row operations
+$user = $fluent->from('user', 1)->fetch();  // WHERE id = 1
+$fluent->update('article', $data, 1)->execute();  // WHERE id = 1
+```
+
+## Testing Environment
+
+Tests use MySQL with database 'fluentdb'. Test configuration:
+- Travis CI: Uses root user with no password
+- Local development: Uses 'vagrant'/'vagrant' credentials
+- Database schema: `tests/_resources/fluentdb.sql`
+- Test initialization: `tests/_resources/init.php`
+
+## Development Notes
+
+- **Modern PHP 8.1+**: This fork requires PHP 8.1+ with strict typing throughout
+- **Type Safety**: All classes use `declare(strict_types=1)` and proper type declarations
+- **Array Handling**: Arrays are automatically converted to JSON strings for database storage
+- **Union Types**: Uses modern PHP union types where appropriate (e.g., `mixed`, `string|null`)
+- **PSR-4 Autoloading**: Namespace remains `Envms\FluentPDO` for compatibility
+- **Iterator Support**: All query builders implement `IteratorAggregate` for direct iteration
+- **Debugging**: Debug mode available via `$fluent->debug` property (mixed type)
+- **Error Handling**: Exception handling configurable via `exceptionOnError` property
+- **Fetch Modes**: Supports both object and array fetch modes with enhanced type safety
+
+## Fork Information
+
+This is a modernized fork of [envms/fluentpdo](https://github.com/envms/fluentpdo) (inactive since 2021). Changes include:
+- PHP 8.1+ compatibility with modern type system
+- Fixed array parameter handling (JSON serialization)
+- Enhanced IDE support with proper type hints
+- Updated development dependencies and tools