diff options
| author | Lester Caine <lester@lsces.co.uk> | 2026-05-11 09:25:03 +0100 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2026-05-11 09:25:03 +0100 |
| commit | 4c5724df39a4f22d5b1b1117cc4a6200ce186784 (patch) | |
| tree | 431dad255d5cf0f48d4002f21d49c762579b1ee1 | |
| parent | a64cc9967a255bf52811e8a74d2e30f88cb56671 (diff) | |
| download | webtrees-4c5724df39a4f22d5b1b1117cc4a6200ce186784.tar.gz webtrees-4c5724df39a4f22d5b1b1117cc4a6200ce186784.tar.bz2 webtrees-4c5724df39a4f22d5b1b1117cc4a6200ce186784.zip | |
Add Firebird/PDO support via lsces/illuminate-firebirdHEADv2.2.7-lscfirebird
| -rwxr-xr-x[-rw-r--r--] | README.md | 286 | ||||
| -rw-r--r-- | app/DB.php | 28 | ||||
| -rwxr-xr-x[-rw-r--r--] | app/Http/RequestHandlers/CheckTree.php | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | app/Schema/Migration0.php | 41 | ||||
| -rw-r--r-- | app/Schema/Migration37.php | 44 | ||||
| -rw-r--r-- | app/Schema/Migration42.php | 8 | ||||
| -rw-r--r-- | app/Schema/Migration44.php | 5 | ||||
| -rw-r--r-- | app/Schema/Migration45.php | 5 | ||||
| -rw-r--r-- | app/Services/AdminService.php | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | app/Services/GedcomExportService.php | 12 | ||||
| -rw-r--r-- | composer.json | 304 | ||||
| -rw-r--r-- | composer.lock | 338 |
12 files changed, 562 insertions, 527 deletions
diff --git a/README.md b/README.md index 931f48d460..b6e795f9d6 100644..100755 --- a/README.md +++ b/README.md @@ -8,284 +8,30 @@ [](https://github.styleci.io/repos/11836349?branch=main) # webtrees - online collaborative genealogy -## Contents +## Source information -* [License](#license) -* [Coding styles and standards](#coding-styles-and-standards) -* [Introduction](#introduction) -* [System requirements](#system-requirements) -* [Internet browser compatibility](#browser-compatibility) -* [Installation](#installation) -* [Upgrading](#upgrading) -* [Building and developing](#building-and-developing) -* [Gedcom (family tree) files](#gedcom-family-tree-files) -* [Security](#security) -* [Backup](#backup) -* [Restore from Backup](#restore-from-backup) +https://github.com/fisharebest/webtrees/blob/main/README.md -## License +## Firebird Fork -* **webtrees: online genealogy** -* Copyright 2022 webtrees development team +This fork is being used to develope both the firebird-support driver for laravel and install webtrees to run with a firebird database. +I have been working through a lot of new stuff, not the least getting my head around the minefield of illuminate, but I am finally getting this under control. -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +The basics that I've had to overcome are mainly down to PDO, such as the fact that firebird does not support lastInsertId and some other PDO assumptions. I've wrapped insert so that it uses 'RETURNING' to emulate that but need a little more work so that it can identify just which field it should be returning. +The main problem is with upper and lower case names in the database. Firebird works best just defaulting to upper case and only wrapping reserved words, but PHP expects the keys to be lower case. I have emulated what happens in ADOdb and sorted the returns to be lower case, but webtrees does use some upper case keys and I'm not sure if that is a problem. +The problem of indexes that firebird can reuse so objects to the addition of 'duplicates' is a little iritating, but can be managed. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +## TODO -You should have received a copy of the GNU General Public License -along with this program. If not, see <https://www.gnu.org/licenses/>. +<del>Currently while pending changes are being listed, they do not seem to be shown in the results?</del> +Actually this is now working fine, one of the other changes seems to have retored it. -## Coding styles and standards +The pending changes accept button was not working. This has been address and was down to the places delete function. <del>Need to override the mysql version with one more like SQLite, but at some point tidying this further to use WHERE NOT EXISTS () should tidy things further and can be done in the driver.</del> +Still working on the delete function as it needs a little more help than initially though, but WHERE NOT EXISTS () needs a different selectSQL to that used by join. Working on migrating the join into the correct extra where so that the main body of delete does not need the 'IN' field. -webtrees follows the [PHP Standards Recommendations](https://www.php-fig.org/psr). +Gedcom Export IS working, but I need to sort the hack to handle getting the idents in numerical order using CHAR_LENGTH in place of LENGTH -* [PSR-1](https://www.php-fig.org/psr/psr-1) - Basic Coding Standard -* [PSR-2](https://www.php-fig.org/psr/psr-2) - Coding Style Guide -* [PSR-4](https://www.php-fig.org/psr/psr-4) - Autoloading Standard -* [PSR-6](https://www.php-fig.org/psr/psr-6) - Cache -* [PSR-7](https://www.php-fig.org/psr/psr-7) - HTTP Message Interface -* [PSR-11](https://www.php-fig.org/psr/psr-11) - Container Interface -* [PSR-12](https://www.php-fig.org/psr/psr-12) - Extended Coding Style Guide -* [PSR-15](https://www.php-fig.org/psr/psr-15) - HTTP Handlers -* [PSR-17](https://www.php-fig.org/psr/psr-17) - HTTP Factories +Migration45.php was giving a problem, but this was down to the check if a column exists which needed upper case field name to match the systems tables. -We do not currently use [PSR-3 (logging)](https://www.php-fig.org/psr/psr-3) - but we plan to do so in the future. +There are a lot of areas I have not yet exercised, but I'm happy that for people not logged in, it is working so am planning to move my sqlite powered live site over to firebird as a next step before doing more work on the logged in type stuff. -For JavaScript, we use [semistandard](https://github.com/standard/semistandard). - -## Introduction - -**webtrees** is the web's leading online collaborative genealogy application. - -* It works from standard GEDCOM files, and is therefore compatible with every -major desktop application. -* It aims to to be efficient and effective by using the right combination of -third-party tools, design techniques and open standards. - -**webtrees** allows you to view and edit your genealogy on your website. It has -full editing capabilities, full privacy functions, and supports imedia such as -photos and document images. As an online program, it fosters extended family -participation and good ancestral recording habits, as it simplifies the process -of collaborating with others working on your family lines. Your latest information -is always on your web site and available for others to see, defined by viewing -rules you set. For more information and to see working demos, visit -[webtrees.net](https://webtrees.net/). - -**webtrees** is Open Source software that has been produced by people from many -countries freely donating their time and talents to the project. All service, -support, and future development is dependent on the time developers are willing -to donate to the project, often at the expense of work, recreation, and family. -Beyond the few donations received from users, developers receive no compensation -for the time they spend working on the project. There is also no outside source -of revenue to support the project. Please consider these circumstances when -making support requests and consider volunteering your own time and skills to make -the project even stronger and better. - -## System requirements - -To install **webtrees**, you need: - -* A webserver. Apache, NGINX and IIS are the most common types. To use “Pretty URLs”, you will need to configure URL rewriting" -* A database. MySQL is recommended, although PostgreSQL, SQL-Server and SQLite can be used. Some features rely on MySQL for collation. Other database might not sort names according to local rules. **webtrees** uses a prefix for its table names, so you can install several instances of webtrees in the same database. -* Approximately 100MB of disk space for the application files, plus whatever is - needed for your media files, GEDCOM files and database. -* PHP 7.1 - 7.4. Servers with PHP 5.3 - 7.0 can use **webtrees** 1.7. - * PHP should be configured to allow sufficient server resources (memory and - execution time) for the size of your system. Typical requirements are: - * Small systems (500 individuals): 16–32 MB, 10–20 seconds - * Medium systems (5,000 individuals): 32–64 MB, 20–40 seconds - * Large systems (50,000 individuals): 64–128 MB, 40–80 seconds - -## Browser compatibility - - **webtrees** is tested on recent versions of popular browsers such as Edge, Firefox, - Chrome, and Safari. Support for other browsers and older versions is on a case-by-case basis. - -## Installation - -1. Download the .ZIP file for latest stable version from [github.com](https://github.com/fisharebest/webtrees/releases/latest). -2. Unzip the files and then upload them to an empty folder on your web server. -3. Open your web browser and type the URL for your **webtrees** site (for example, - ``https://www.yourserver.com/webtrees`` into the address bar. -4. The **webtrees** setup wizard will start automatically. - -Your first task will be to create a family tree. - -If you have a GEDCOM file, you can import it into the tree. If not, just start -entering your family tree. - -There are lots of configuration options. You'll probably want to review the -privacy settings first. Don't worry too much about all the other options - the -defaults are good for most people. If you get stuck, you can get friendly help -and advice from the [help](https://www.webtrees.net/index.php/forum) forum. - -## Upgrading - -Upgrading **webtrees** is quick and easy. It is strongly recommended that you -upgrade your installation whenever a new version is made available. Even minor -**webtrees** version updates usually contain a significant number of bug fixes -as well as interface improvements and program enhancements. - -* **Automatic upgrade** - - **webtrees** has an automatic upgrade facility. An administrator upon logging in -will receive notification when a new version is available and an option to start -the automatic upgrade. If for some reason the automatic upgrade should fail -then a manual upgrade should be performed. - -* **Manual upgrade** - - 1. Now would be a good time to make a [backup](#backup). - 2. Download the latest version of **webtrees** available from - [webtrees.net](https://webtrees.net/) - 3. While you are in the middle of uploading the new files, - a visitor to your site would encounter a mixture of new and old files. This - could cause unpredictable behavior or errors. To prevent this, create the - file **data/offline.txt**. While this file exists, visitors will see a - “site unavailable - come back later” message. - 4. Unzip the .ZIP file, and upload the files to your web server, overwriting the existing files. - 5. Delete the file **data/offline.txt**. - -### Note for Macintosh users - -Step 4 assumes you are using a copy tool that **merges** directories rather than -replaces them. (**Merge** is standard behavior on Windows and Linux.) If you use -the Macintosh Finder or other similar tool to perform step 3, it will **replace** -your configuration, media and other directories with the empty/default ones from -the installation. This would be very bad (but you did take a backup in step 1, -didn't you!). Further details and recommendations for suitable tools can be found -by searching [google.com](https://google.com). - -## Building and developing - -If you want to build webtrees from source, or modify the code, you'll need to install -a couple of tools first. - -You will need [composer](https://getcomposer.org/) to install the PHP dependencies. -Then run this command:: - -* php composer.phar install - -You will need [npm](https://www.npmjs.com/get-npm) to install the Javascript dependencies. -Then run the commands: - -* npm install -* npm run build - -You will need to re-run the second of these any time you modify the file `webtrees.js`. - -## Gedcom (family tree) files - -When you import a family tree (GEDCOM) file in **webtrees** the -data from the file is transferred to the database tables. The file itself -remains in the **webtrees/data** folder and is no longer used or required -by **webtrees**. Any subsequent editing of the **webtrees** data -will not change this file - -When or if you change your genealogy data outside of **webtrees**, it is not -necessary to delete your GEDCOM file or database from **webtrees** and start -over. Follow these steps to update a GEDCOM that has already been imported: - -* Go to ``Control panel`` -> ``Manage family trees`` On the line relating to this particular family tree (GEDCOM) - file (or a new one) select IMPORT. -* Take careful note of the media items option (_“If you have created media objects - in **webtrees**, and have edited your data off-line using software that - deletes media objects, then tick this box to merge the current media objects - with the new GEDCOM.”_) In most cases you should leave this box **UNCHECKED**. -* Click “SAVE”. **webtrees** will validate the GEDCOM again before importing. - During this process, **webtrees** copies your entire family tree (GEDCOM file) - to a 'chunk' table within your database. Depending on the coding of your file, - its file size and the capabilities of your server and the supporting software, - this may take some time. **No progress bar will show while the data is being - copied** and should you navigate away from this page, the process is suspended. - It will start again when you return to the Family Tree management page. - -## Security - -**Security** in _webtrees_ means ensuring your site is safe from unwanted -intrusions, hacking, or access to data and configuration files. The developers -of _webtrees_ regard security as an extremely important part of its development -and have made every attempt to ensure your data is safe. - -The area most at risk of intrusion would be the **/data** folder that contains your -config.ini.php file, and various temporary files. If you are concerned there -may be a risk there is a very simple test you can do: try to fetch the file -config.ini.php by typing **``url_to_your_server/data/config.ini.php``** in your web -browser. - -The most likely result is an “access denied” message like this: - - Forbidden - - You don't have permission to access /data/config.ini.php on this server. - -This indicates that the protection built into **webtrees** is working, and no -further action is required. - -In the unlikely event you do fetch the file (you will just see a semicolon), -then that protection is not working on your site and you should take some further -action. - -If your server runs PHP in CGI mode, then change the permission of the **/data** -folder to 700 instead of 777. This will block access to the httpd process, -while still allowing access to PHP scripts. - -This will work for perhaps 99% of all users. Only the remaining 1% should consider -the most complex solution, moving the **/data** folder out of accessible web -space. (**_Note:_** In many shared hosting environments this is not an option anyway.) - -If you do find it necessary, following is an example of the process required: - -If your home folder is something like **/home/username**, -and the root folder for your web site is **/home/username/public_html**, -and you have installed **webtrees** in the **public_html/webtrees** folder, -then you would create a new **data** folder in your home folder at the same -level as your public_html folder, such as **/home/username/private/data**, -and place your GEDCOM (family tree) file there. - -Then change the **Data folder** setting on the ``Control panel`` -> -``Website`` -> ``Website preferences`` page from the default **data/** to the new -location **/home/username/private/data** - -You will have **two** data directories: - -* [path to webtrees]/data - just needs to contain config.ini.php -* /home/username/private/data - contains everything else - -## Backup - -Backups are good. Whatever problem you have, it can always be fixed from a good -backup. - -To make a backup of **webtrees**, you need to make a copy of the following - -1. The files in the *webtrees/data* folder. -2. The tables in the database. Freely available tools such as - [phpMyAdmin](https://www.phpmyadmin.net) allow you to do this in one click. Alternatively, You can also make a backup running a mysqldump command (just replace the words *[localhost]*, *[username]*, *[password]* and *[databasename]* with your own): - - `mysqldump --host=[localhost] -u [username] -p[password] --databases [databasename] > dump_file.sql` - - Note that '*-p[password]*' goes together with no space in between. - -Remember that most web hosting services do NOT backup your data, and this is -your responsibility. - -## Restore from backup - -To restore a backup on a new server: - -1. Follow the steps in [Installation](#installation) to get a clean new installation. - -2. Replace the *data* folder with backup copy. - -3. Restore your mysql database using phpmyadmin or running the following command line on your database server using your mysqldumpfile (just replace the words *[username]*, *[password]* and *[databasename]* with your own): - - `mysql -u [username] -p[password] [database_name] < [dump_file.sql]` - -4. Confirm the file *data/config.ini.php* contains to correct information to connect to the database and update it if needed. diff --git a/app/DB.php b/app/DB.php index f71ecd8d71..1e04911cee 100644 --- a/app/DB.php +++ b/app/DB.php @@ -20,6 +20,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees; use Closure; +use Illuminate\Container\Container; +use Illuminate\Database\Connection; use Illuminate\Database\Capsule\Manager; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; @@ -27,6 +29,8 @@ use PDO; use PDOException; use RuntimeException; use SensitiveParameter; +use Firebird\Illuminate\FirebirdConnection; +use Firebird\Illuminate\FirebirdConnector; final class DB extends Manager { @@ -119,8 +123,19 @@ final class DB extends Manager $database = Webtrees::ROOT_DIR . 'data/' . $database . '.sqlite'; } - $capsule = new self(); - $capsule->addConnection([ + $container = new Container(); + $capsule = new self($container); + + if ($driver === self::FIREBIRD) { + Connection::resolverFor('firebird', + function ($connection, $database, $tablePrefix, $config) + { + return new FirebirdConnection($connection, $database, $tablePrefix, $config); + }); + $container->instance('db.connector.firebird', new FirebirdConnector); + } + + $capsule->addConnection([ 'driver' => $driver, 'host' => $host, 'port' => $port, @@ -160,7 +175,14 @@ final class DB extends Manager public static function lastInsertId(): int { - $return = self::pdo()->lastInsertId(); + if (self::driverName() != self::FIREBIRD) { + $return = self::pdo()->lastInsertId(); + } else { + // Get the connection instance and access its lastInsertId property + $connection = self::connection(); // Get the connection instance + $return = $connection->getLastInsertId(); + } + if ($return === false) { throw new RuntimeException('Unable to retrieve last insert ID'); diff --git a/app/Http/RequestHandlers/CheckTree.php b/app/Http/RequestHandlers/CheckTree.php index 803c98c1f1..b6e58154e4 100644..100755 --- a/app/Http/RequestHandlers/CheckTree.php +++ b/app/Http/RequestHandlers/CheckTree.php @@ -91,24 +91,24 @@ final class CheckTree implements RequestHandlerInterface $q1 = DB::table('individuals') ->where('i_file', '=', $tree->id()) - ->select(['i_id AS xref', 'i_gedcom AS gedcom', new Expression("'INDI' AS type")]); + ->select(['i_id AS xref', 'i_gedcom AS gedcom', new Expression("'INDI' AS type"), '0 AS change_id']); $q2 = DB::table('families') ->where('f_file', '=', $tree->id()) - ->select(['f_id AS xref', 'f_gedcom AS gedcom', new Expression("'FAM' AS type")]); + ->select(['f_id AS xref', 'f_gedcom AS gedcom', new Expression("'FAM' AS type"), '0 AS change_id']); $q3 = DB::table('media') ->where('m_file', '=', $tree->id()) - ->select(['m_id AS xref', 'm_gedcom AS gedcom', new Expression("'OBJE' AS type")]); + ->select(['m_id AS xref', 'm_gedcom AS gedcom', new Expression("'OBJE' AS type"), '0 AS change_id']); $q4 = DB::table('sources') ->where('s_file', '=', $tree->id()) - ->select(['s_id AS xref', 's_gedcom AS gedcom', new Expression("'SOUR' AS type")]); + ->select(['s_id AS xref', 's_gedcom AS gedcom', new Expression("'SOUR' AS type"), '0 AS change_id']); $q5 = DB::table('other') ->where('o_file', '=', $tree->id()) - ->select(['o_id AS xref', 'o_gedcom AS gedcom', 'o_type']); + ->select(['o_id AS xref', 'o_gedcom AS gedcom', 'o_type', '0 AS change_id']); $q6 = DB::table('change') ->where('gedcom_id', '=', $tree->id()) ->where('status', '=', 'pending') - ->orderBy('change_id') - ->select(['xref', 'new_gedcom AS gedcom', new Expression("'' AS type")]); + ->orderBy(DB::driverName() === DB::FIREBIRD ? '4' : 'change_id') + ->select(['xref', 'new_gedcom AS gedcom', new Expression("'' AS type"), 'change_id']); $rows = $q1 ->unionAll($q2) diff --git a/app/Schema/Migration0.php b/app/Schema/Migration0.php index 9ce32de43d..6c51f55d46 100644..100755 --- a/app/Schema/Migration0.php +++ b/app/Schema/Migration0.php @@ -86,7 +86,10 @@ class Migration0 implements MigrationInterface $key = DB::prefix($table->getTable() . '_primary'); $table->primary(['user_id', 'gedcom_id', 'setting_name'], $key); - $table->index('gedcom_id'); + if (DB::driverName() != DB::FIREBIRD) { + // since index exists for gedcom_id will not add duplicate + $table->index('gedcom_id'); + } $table->foreign('user_id')->references('user_id')->on('user'); $table->foreign('gedcom_id')->references('gedcom_id')->on('gedcom'); @@ -164,7 +167,11 @@ class Migration0 implements MigrationInterface $table->longText('i_gedcom'); $table->primary(['i_id', 'i_file']); - $table->unique(['i_file', 'i_id']); + if (DB::driverName() != DB::FIREBIRD) { + // since a usable index exists firebird will not add duplicate + $table->unique(['i_file', 'i_id']); + } + }); DB::schema()->create('families', static function (Blueprint $table): void { @@ -176,7 +183,10 @@ class Migration0 implements MigrationInterface $table->integer('f_numchil'); $table->primary(['f_id', 'f_file']); - $table->unique(['f_file', 'f_id']); + if (DB::driverName() != DB::FIREBIRD) { + // since a usable index exists firebird will not add duplicate + $table->unique(['f_file', 'f_id']); + } $table->index('f_husb'); $table->index('f_wife'); }); @@ -238,7 +248,10 @@ class Migration0 implements MigrationInterface $table->longText('m_gedcom')->nullable(); $table->primary(['m_file', 'm_id']); - $table->unique(['m_id', 'm_file']); + if (DB::driverName() != DB::FIREBIRD) { + // since a usable index exists firebird will not add duplicate + $table->unique(['m_id', 'm_file']); + } // Originally, this migration created an index on m_ext and m_type, // but we drop those columns in migration 37. }); @@ -260,7 +273,10 @@ class Migration0 implements MigrationInterface $table->longText('o_gedcom'); $table->primary(['o_id', 'o_file']); - $table->unique(['o_file', 'o_id']); + if (DB::driverName() != DB::FIREBIRD) { + // since a usable index exists firebird will not add duplicate + $table->unique(['o_file', 'o_id']); + } }); DB::schema()->create('sources', static function (Blueprint $table): void { @@ -270,7 +286,10 @@ class Migration0 implements MigrationInterface $table->longText('s_gedcom'); $table->primary(['s_id', 's_file']); - $table->unique(['s_file', 's_id']); + if (DB::driverName() != DB::FIREBIRD) { + // since a usable index exists firebird will not add duplicate + $table->unique(['s_file', 's_id']); + } $table->index('s_name'); }); @@ -281,7 +300,10 @@ class Migration0 implements MigrationInterface $table->string('l_to', 20); $table->primary(['l_from', 'l_file', 'l_type', 'l_to']); - $table->unique(['l_to', 'l_file', 'l_type', 'l_from']); + if (DB::driverName() != DB::FIREBIRD) { + // since a usable index exists firebird will not add duplicate + $table->unique(['l_to', 'l_file', 'l_type', 'l_from']); + } }); DB::schema()->create('name', static function (Blueprint $table): void { @@ -336,7 +358,10 @@ class Migration0 implements MigrationInterface $key1 = DB::prefix($table->getTable() . '_ix1'); $table->primary(['module_name', 'gedcom_id', 'component'], $key0); - $table->unique(['gedcom_id', 'module_name', 'component'], $key1); + if (DB::driverName() != DB::FIREBIRD) { + // since a usable index exists firebird will not add duplicate + $table->unique(['gedcom_id', 'module_name', 'component'], $key1); + } $table->foreign('module_name')->references('module_name')->on('module'); $table->foreign('gedcom_id')->references('gedcom_id')->on('gedcom'); diff --git a/app/Schema/Migration37.php b/app/Schema/Migration37.php index 58701552e1..fa8cc73c24 100644 --- a/app/Schema/Migration37.php +++ b/app/Schema/Migration37.php @@ -32,8 +32,12 @@ class Migration37 implements MigrationInterface public function upgrade(): void { // These tables were created by webtrees 1.x, and may not exist if we first installed webtrees 2.x - DB::schema()->dropIfExists('site_access_rule'); - DB::schema()->dropIfExists('next_id'); + if (DB::schema()->hasTable('site_access_rule')) { + DB::schema()->drop('site_access_rule'); + } + if (DB::schema()->hasTable('next_id')) { + DB::schema()->drop('next_id'); + } // Split the media table into media/media_file so that we can store multiple media // files in each media object. @@ -50,9 +54,12 @@ class Migration37 implements MigrationInterface $table->index(['m_id', 'm_file']); $table->index(['m_file', 'm_id']); $table->index(['m_file', 'multimedia_file_refn']); - $table->index(['m_file', 'multimedia_format']); - $table->index(['m_file', 'source_media_type']); - $table->index(['m_file', 'descriptive_title']); + if (DB::driverName() != DB::FIREBIRD) { + // firebird will not add duplicate indexs, but not quite sure why these are a problem + $table->index(['m_file', 'multimedia_format']); + $table->index(['m_file', 'source_media_type']); + $table->index(['m_file', 'descriptive_title']); + } }); } @@ -68,14 +75,25 @@ class Migration37 implements MigrationInterface // SQLite also supports SUBSTRING() from 3.34.0 (2020-12-01) $substring_function = DB::driverName() === DB::SQLITE ? 'SUBSTR' : 'SUBSTRING'; - $query->select([ - 'm_id', - 'm_file', - new Expression($substring_function . '(m_filename, 1, 248)'), - new Expression($substring_function . '(m_ext, 1, 4)'), - new Expression($substring_function . '(m_type, 1, 15)'), - new Expression($substring_function . '(m_titl, 1, 248)'), - ])->from('media'); + if (DB::driverName() != DB::FIREBIRD) { + $query->select([ + 'm_id', + 'm_file', + new Expression($substring_function . '(m_filename, 1, 248)'), + new Expression($substring_function . '(m_ext, 1, 4)'), + new Expression($substring_function . '(m_type, 1, 15)'), + new Expression($substring_function . '(m_titl, 1, 248)'), + ])->from('media'); + } else { + $query->select([ + 'm_id', + 'm_file', + new Expression($substring_function . '(m_filename FROM 1 FOR 248)'), + new Expression($substring_function . '(m_ext FROM 1 FOR 4)'), + new Expression($substring_function . '(m_type FROM 1 FOR 15)'), + new Expression($substring_function . '(m_titl FROM 1 FOR 248)'), + ])->from('media'); + } }); // The Laravel database library for SQLite can only drop one column at a time. diff --git a/app/Schema/Migration42.php b/app/Schema/Migration42.php index 3b24443c54..38c00ecba5 100644 --- a/app/Schema/Migration42.php +++ b/app/Schema/Migration42.php @@ -62,10 +62,12 @@ class Migration42 implements MigrationInterface // Default constraint names are too long for MySQL. $key1 = DB::prefix($table->getTable() . '_ix1'); - $key2 = DB::prefix($table->getTable() . '_ix2'); - $table->unique(['gedcom_id', 'module_name', 'interface'], $key1); - $table->unique(['module_name', 'gedcom_id', 'interface'], $key2); + if (DB::driverName() != DB::FIREBIRD) { + // since unique index exists for fields firebird will not add duplicate + $key2 = DB::prefix($table->getTable() . '_ix2'); + $table->unique(['module_name', 'gedcom_id', 'interface'], $key2); + } $table->foreign('module_name')->references('module_name')->on('module')->cascadeOnDelete(); $table->foreign('gedcom_id')->references('gedcom_id')->on('gedcom')->cascadeOnDelete(); diff --git a/app/Schema/Migration44.php b/app/Schema/Migration44.php index 0495552c0f..8855083291 100644 --- a/app/Schema/Migration44.php +++ b/app/Schema/Migration44.php @@ -42,7 +42,10 @@ class Migration44 implements MigrationInterface $table->double('longitude')->nullable(); $table->unique(['parent_id', 'place']); - $table->unique(['place', 'parent_id']); + if (DB::driverName() != DB::FIREBIRD) { + // since unique index exists for fields firebird will not add duplicate + $table->unique(['place', 'parent_id']); + } $table->index(['latitude']); $table->index(['longitude']); diff --git a/app/Schema/Migration45.php b/app/Schema/Migration45.php index b8e7a6e774..da55bed172 100644 --- a/app/Schema/Migration45.php +++ b/app/Schema/Migration45.php @@ -54,10 +54,9 @@ final readonly class Migration45 implements MigrationInterface // SQL-Server can't use CASCADE or SET NULL constraints here, as it can't handle multiple paths $table->foreign(columns: ['contact_user_id'])->references(['user_id'])->on('user'); $table->foreign(columns: ['support_user_id'])->references(['user_id'])->on('user'); - } else { + } else if !(DB::driverName() === DB::FIREBIRD) { $table->foreign(columns: ['contact_user_id'])->references(['user_id'])->on('user')->nullOnDelete()->cascadeOnUpdate(); - $table->foreign(columns: ['support_user_id'])->references(['user_id'])->on('user')->nullOnDelete()->cascadeOnUpdate(); - } + $table->foreign(columns: ['support_user_id'])->references(['user_id'])->on('user')->nullOnDelete()->cascadeOnUpdate(); } }); } diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php index 31c372e2d1..0b053257dd 100644 --- a/app/Services/AdminService.php +++ b/app/Services/AdminService.php @@ -157,8 +157,8 @@ class AdminService $families = DB::table('families') ->where('f_file', '=', $tree->id()) - ->groupBy([new Expression('LEAST(f_husb, f_wife)')]) - ->groupBy([new Expression('GREATEST(f_husb, f_wife)')]) + ->groupBy([new Expression( DB::driverName() === DB::FIREBIRD ? 'MINVALUE(f_husb, f_wife)' : 'LEAST(f_husb, f_wife)' )]) + ->groupBy([new Expression( DB::driverName() === DB::FIREBIRD ? 'MAXVALUE(f_husb, f_wife)' : 'GREATEST(f_husb, f_wife)' )]) ->having(new Expression('COUNT(f_id)'), '>', '1') ->select([new Expression(DB::groupConcat('f_id') . ' AS xrefs')]) ->orderBy('xrefs') diff --git a/app/Services/GedcomExportService.php b/app/Services/GedcomExportService.php index 18018d1e1c..d5fcb1bdaa 100644..100755 --- a/app/Services/GedcomExportService.php +++ b/app/Services/GedcomExportService.php @@ -236,7 +236,7 @@ class GedcomExportService $datum->f_gedcom ?? $datum->s_gedcom ?? $datum->m_gedcom ?? - $datum->o_gedcom; + $datum->o_gedcom ?? ''; } if ($media_path !== null && preg_match('/^0 @' . Gedcom::REGEX_XREF . '@ OBJE/', $gedcom) === 1) { @@ -378,7 +378,7 @@ class GedcomExportService if ($sort_by_xref) { $query - ->orderBy(new Expression('LENGTH(f_id)')) + ->orderBy(new Expression((DB::driverName() === DB::FIREBIRD ? 'CHAR_' : '' ).'LENGTH(f_id)')) ->orderBy('f_id'); } @@ -393,7 +393,7 @@ class GedcomExportService if ($sort_by_xref) { $query - ->orderBy(new Expression('LENGTH(i_id)')) + ->orderBy(new Expression((DB::driverName() === DB::FIREBIRD ? 'CHAR_' : '' ).'LENGTH(i_id)')) ->orderBy('i_id'); } @@ -408,7 +408,7 @@ class GedcomExportService if ($sort_by_xref) { $query - ->orderBy(new Expression('LENGTH(s_id)')) + ->orderBy(new Expression((DB::driverName() === DB::FIREBIRD ? 'CHAR_' : '' ).'LENGTH(s_id)')) ->orderBy('s_id'); } @@ -423,7 +423,7 @@ class GedcomExportService if ($sort_by_xref) { $query - ->orderBy(new Expression('LENGTH(m_id)')) + ->orderBy(new Expression((DB::driverName() === DB::FIREBIRD ? 'CHAR_' : '' ).'LENGTH(m_id)')) ->orderBy('m_id'); } @@ -440,7 +440,7 @@ class GedcomExportService if ($sort_by_xref) { $query ->orderBy('o_type') - ->orderBy(new Expression('LENGTH(o_id)')) + ->orderBy(new Expression((DB::driverName() === DB::FIREBIRD ? 'CHAR_' : '' ).'LENGTH(o_id)')) ->orderBy('o_id'); } diff --git a/composer.json b/composer.json index c6830bf142..bb36cc6abc 100644 --- a/composer.json +++ b/composer.json @@ -1,153 +1,155 @@ { - "name": "fisharebest/webtrees", - "description": "webtrees online genealogy", - "type": "project", - "keywords": [ - "webtrees", - "genealogy" - ], - "license": "GPL-3.0-or-later", - "autoload": { - "psr-4": { - "Fisharebest\\Webtrees\\": "app/" - }, - "files": [ - "app/Helpers/functions.php" - ] - }, - "autoload-dev": { - "classmap": [ - "tests/TestCase.php", - "tests/app/Elements/AbstractElementTestCase.php" - ] - }, - "config": { - "platform": { - "php": "8.3.0" - }, - "sort-packages": true, - "process-timeout": 3600, - "allow-plugins": { - "phpstan/extension-installer": true - } - }, - "require": { - "php": "8.3 - 8.6", - "ext-ctype": "*", - "ext-curl": "*", - "ext-gd": "*", - "ext-iconv": "*", - "ext-intl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "ext-pcre": "*", - "ext-pdo": "*", - "ext-session": "*", - "ext-xml": "*", - "aura/router": "3.4.2", - "ezyang/htmlpurifier": "4.19.0", - "fig/http-message-util": "1.1.5", - "fisharebest/algorithm": "1.6.0", - "fisharebest/ext-calendar": "2.6.0", - "fisharebest/localization": "1.17.0", - "guzzlehttp/guzzle": "7.10.0", - "illuminate/database": "12.58.0", - "illuminate/support": "12.58.0", - "intervention/image": "4.0.3", - "league/commonmark": "2.8.2", - "league/flysystem": "3.33.0", - "league/flysystem-path-prefixing": "3.31.0", - "league/flysystem-ziparchive": "3.31.0", - "middlewares/client-ip": "2.1.0", - "mlocati/ip-lib": "1.22.0", - "nesbot/carbon": "3.11.4", - "nyholm/psr7": "1.8.2", - "nyholm/psr7-server": "1.1.0", - "psr/cache": "3.0.0", - "psr/http-message": "2.0", - "psr/http-server-handler": "1.0.2", - "psr/http-server-middleware": "1.0.2", - "ramsey/uuid": "4.9.2", - "sabre/vobject": "4.5.8", - "symfony/cache": "7.4.9", - "symfony/console": "7.4.9", - "symfony/expression-language": "7.4.8", - "symfony/mailer": "7.4.8", - "symfony/polyfill-mbstring": "1.37.0", - "tecnickcom/tcpdf": "6.11.3" - }, - "require-dev": { - "ext-dom": "*", - "ext-libxml": "*", - "ext-pdo_sqlite": "*", - "ext-sqlite3": "*", - "league/flysystem-memory": "3.31.0", - "php-coveralls/php-coveralls": "2.9.1", - "phpstan/extension-installer": "1.4.3", - "phpstan/phpstan": "2.1.54", - "phpstan/phpstan-deprecation-rules": "2.0.4", - "phpstan/phpstan-phpunit": "2.0.16", - "phpunit/phpunit": "12.5.24", - "squizlabs/php_codesniffer": "4.0.1" - }, - "suggest": { - "ext-imagick": "Required to generate thumbnail images", - "ext-pdo_mysql": "Required to use MySQL for database storage", - "ext-pdo_sqlite": "Required to use SQLite for database storage", - "ext-pdo_pgsql": "Required to use PostgreSQL for database storage", - "ext-pdo_sqlsrv": "Required to use SQL Server for database storage", - "ext-zip": "Required to compress downloads and use the upgrade wizard", - "ext-zlib": "Required to compress HTTP responses" - }, - "scripts": { - "webtrees:build": [ - "rm -Rf webtrees/", - "git archive --prefix=webtrees/ HEAD --format=tar | tar -x", - "@composer install --no-dev --quiet", - "cp -r vendor/ webtrees/vendor/", - "echo 'Workaround for orphaned file from Laravel 8 (webtrees 2.1) that breaks Laravel 11 (webtrees 2.2)'", - "echo \"<?php require __DIR__ . '/../../conditionable/Traits/Conditionable.php';\" > webtrees/vendor/illuminate/support/Traits/Conditionable.php", - "php index.php compile-po-files", - "for FILE in resources/lang/*/messages.php; do cp $FILE webtrees/$FILE; done", - "zip --quiet --recurse-paths --move -9 webtrees-`git describe`.zip webtrees" - ], - "webtrees:phpcs": [ - "vendor/bin/phpcs --colors --exclude=Generic.Files.LineLength index.php app tests" - ], - "webtrees:phpstan": [ - "vendor/bin/phpstan analyze -v --memory-limit=-1" - ], - "webtrees:phpstan-baseline": [ - "vendor/bin/phpstan analyze --memory-limit=-1 --generate-baseline=phpstan-baseline.neon" - ], - "webtrees:test": [ - "vendor/bin/phpunit" - ], - "webtrees:coverage": [ - "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html=tests/coverage" - ], - "webtrees:po": [ - "sed -i.bak -e 's/\\(I18N::[^)]*[)]\\)/<?php echo \\1; ?>/g' resources/xml/reports/*.xml", - "git grep -I --name-only --fixed-strings -e I18N:: -- '*.php' '*.phtml' '*.xml' | xargs xgettext --package-name=webtrees --package-version=1.0 --output=resources/lang/webtrees.pot --no-wrap --language=PHP --add-comments=I18N --from-code=utf-8 --keyword --keyword=translate:1 --keyword=translateContext:1c,2 --keyword=plural:1,2", - "find resources/xml/reports/ -name '*.xml' -exec mv {}.bak {} \\;", - "find resources/lang -name '*.po' -exec msgmerge --no-wrap --sort-output --no-fuzzy-matching --quiet --output={} {} resources/lang/webtrees.pot \\;" - ], - "webtrees:png": [ - "find resources/css -name *.png -exec pngquant --ext .png --force --skip-if-larger --speed 1 {} \\;", - "find resources/css -name *.png -exec pngcrush -rem allb -brute -reduce {} {} \\;", - "find resources/css -name *.png -exec optipng -o7 -zm1-9 {} \\;" - ], - "ci" : [ - "@composer validate", - "@composer install --quiet", - "@composer webtrees:test", - "@composer webtrees:phpcs", - "@composer webtrees:phpstan" - ] - }, - "scripts-descriptions": { - "webtrees:build": "Create a distribution file (webtrees.zip)", - "webtrees:coverage": "Generate test coverage report", - "webtrees:po": "Update the language (webtrees.pot, *.po)" - } + "name": "fisharebest/webtrees", + "description": "webtrees online genealogy", + "type": "project", + "keywords": [ + "webtrees", + "genealogy" + ], + "license": "GPL-3.0-or-later", + "autoload": { + "psr-4": { + "Fisharebest\\Webtrees\\": "app/" + }, + "files": [ + "app/Helpers/functions.php" + ] + }, + "autoload-dev": { + "classmap": [ + "tests/TestCase.php", + "tests/app/Elements/AbstractElementTestCase.php" + ] + }, + "config": { + "platform": { + "php": "8.3.0" + }, + "sort-packages": true, + "process-timeout": 3600, + "allow-plugins": { + "phpstan/extension-installer": true + } + }, + "require": { + "php": "8.3 - 8.6", + "ext-ctype": "*", + "ext-curl": "*", + "ext-gd": "*", + "ext-iconv": "*", + "ext-intl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-pdo": "*", + "ext-session": "*", + "ext-xml": "*", + "aura/router": "3.4.2", + "ezyang/htmlpurifier": "4.19.0", + "fig/http-message-util": "1.1.5", + "fisharebest/algorithm": "1.6.0", + "fisharebest/ext-calendar": "2.6.0", + "fisharebest/localization": "1.17.0", + "guzzlehttp/guzzle": "7.10.0", + "illuminate/database": "12.58.0", + "illuminate/support": "12.58.0", + "intervention/image": "4.0.3", + "league/commonmark": "2.8.2", + "league/flysystem": "3.33.0", + "league/flysystem-path-prefixing": "3.31.0", + "league/flysystem-ziparchive": "3.31.0", + "lsces/illuminate-firebird": "^2.0", + "middlewares/client-ip": "2.1.0", + "mlocati/ip-lib": "1.22.0", + "nesbot/carbon": "3.11.4", + "nyholm/psr7": "1.8.2", + "nyholm/psr7-server": "1.1.0", + "psr/cache": "3.0.0", + "psr/http-message": "2.0", + "psr/http-server-handler": "1.0.2", + "psr/http-server-middleware": "1.0.2", + "ramsey/uuid": "4.9.2", + "sabre/vobject": "4.5.8", + "symfony/cache": "7.4.9", + "symfony/console": "7.4.9", + "symfony/expression-language": "7.4.8", + "symfony/mailer": "7.4.8", + "symfony/polyfill-mbstring": "1.37.0", + "tecnickcom/tcpdf": "6.11.3" + }, + "require-dev": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-pdo_sqlite": "*", + "ext-sqlite3": "*", + "league/flysystem-memory": "3.31.0", + "php-coveralls/php-coveralls": "2.9.1", + "phpstan/extension-installer": "1.4.3", + "phpstan/phpstan": "2.1.54", + "phpstan/phpstan-deprecation-rules": "2.0.4", + "phpstan/phpstan-phpunit": "2.0.16", + "phpunit/phpunit": "12.5.24", + "squizlabs/php_codesniffer": "4.0.1" + }, + "suggest": { + "ext-imagick": "Required to generate thumbnail images", + "ext-pdo_mysql": "Required to use MySQL for database storage", + "ext-pdo_sqlite": "Required to use SQLite for database storage", + "ext-pdo_pgsql": "Required to use PostgreSQL for database storage", + "ext-pdo_sqlsrv": "Required to use SQL Server for database storage", + "ext-pdo_firebird": "Required to use Firebird for database storage", + "ext-zip": "Required to compress downloads and use the upgrade wizard", + "ext-zlib": "Required to compress HTTP responses" + }, + "scripts": { + "webtrees:build": [ + "rm -Rf webtrees/", + "git archive --prefix=webtrees/ HEAD --format=tar | tar -x", + "@composer install --no-dev --quiet", + "cp -r vendor/ webtrees/vendor/", + "echo 'Workaround for orphaned file from Laravel 8 (webtrees 2.1) that breaks Laravel 11 (webtrees 2.2)'", + "echo \"<?php require __DIR__ . '/../../conditionable/Traits/Conditionable.php';\" > webtrees/vendor/illuminate/support/Traits/Conditionable.php", + "php index.php compile-po-files", + "for FILE in resources/lang/*/messages.php; do cp $FILE webtrees/$FILE; done", + "zip --quiet --recurse-paths --move -9 webtrees-`git describe`.zip webtrees" + ], + "webtrees:phpcs": [ + "vendor/bin/phpcs --colors --exclude=Generic.Files.LineLength index.php app tests" + ], + "webtrees:phpstan": [ + "vendor/bin/phpstan analyze -v --memory-limit=-1" + ], + "webtrees:phpstan-baseline": [ + "vendor/bin/phpstan analyze --memory-limit=-1 --generate-baseline=phpstan-baseline.neon" + ], + "webtrees:test": [ + "vendor/bin/phpunit" + ], + "webtrees:coverage": [ + "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html=tests/coverage" + ], + "webtrees:po": [ + "sed -i.bak -e 's/\\(I18N::[^)]*[)]\\)/<?php echo \\1; ?>/g' resources/xml/reports/*.xml", + "git grep -I --name-only --fixed-strings -e I18N:: -- '*.php' '*.phtml' '*.xml' | xargs xgettext --package-name=webtrees --package-version=1.0 --output=resources/lang/webtrees.pot --no-wrap --language=PHP --add-comments=I18N --from-code=utf-8 --keyword --keyword=translate:1 --keyword=translateContext:1c,2 --keyword=plural:1,2", + "find resources/xml/reports/ -name '*.xml' -exec mv {}.bak {} \\;", + "find resources/lang -name '*.po' -exec msgmerge --no-wrap --sort-output --no-fuzzy-matching --quiet --output={} {} resources/lang/webtrees.pot \\;" + ], + "webtrees:png": [ + "find resources/css -name *.png -exec pngquant --ext .png --force --skip-if-larger --speed 1 {} \\;", + "find resources/css -name *.png -exec pngcrush -rem allb -brute -reduce {} {} \\;", + "find resources/css -name *.png -exec optipng -o7 -zm1-9 {} \\;" + ], + "ci" : [ + "@composer validate", + "@composer install --quiet", + "@composer webtrees:test", + "@composer webtrees:phpcs", + "@composer webtrees:phpstan" + ] + }, + "scripts-descriptions": { + "webtrees:build": "Create a distribution file (webtrees.zip)", + "webtrees:coverage": "Generate test coverage report", + "webtrees:po": "Update the language (webtrees.pot, *.po)" + } } diff --git a/composer.lock b/composer.lock index 51b0e702fa..32b328cef0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "542046d245a9ba56a2981048a7da8cc3", + "content-hash": "ddf3e610cda5cf7e7d2482a1c47531ab", "packages": [ { "name": "aura/router", @@ -1122,6 +1122,59 @@ "time": "2026-03-10T16:41:02+00:00" }, { + "name": "illuminate/bus", + "version": "v12.58.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/bus.git", + "reference": "9e70f409c744e0ba6b301fa608bb5b3c8c38669a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/bus/zipball/9e70f409c744e0ba6b301fa608bb5b3c8c38669a", + "reference": "9e70f409c744e0ba6b301fa608bb5b3c8c38669a", + "shasum": "" + }, + "require": { + "illuminate/collections": "^12.0", + "illuminate/contracts": "^12.0", + "illuminate/pipeline": "^12.0", + "illuminate/support": "^12.0", + "php": "^8.2" + }, + "suggest": { + "illuminate/queue": "Required to use closures when chaining jobs (^12.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Bus\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Bus package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2026-03-09T13:55:34+00:00" + }, + { "name": "illuminate/collections", "version": "v12.58.0", "source": { @@ -1411,6 +1464,61 @@ "time": "2026-04-13T12:59:35+00:00" }, { + "name": "illuminate/events", + "version": "v12.58.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/events.git", + "reference": "ff22aa6017bdbd90ace660f50638ed9c580ba555" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/events/zipball/ff22aa6017bdbd90ace660f50638ed9c580ba555", + "reference": "ff22aa6017bdbd90ace660f50638ed9c580ba555", + "shasum": "" + }, + "require": { + "illuminate/bus": "^12.0", + "illuminate/collections": "^12.0", + "illuminate/container": "^12.0", + "illuminate/contracts": "^12.0", + "illuminate/macroable": "^12.0", + "illuminate/support": "^12.0", + "php": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php" + ], + "psr-4": { + "Illuminate\\Events\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Events package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2026-03-05T16:20:14+00:00" + }, + { "name": "illuminate/macroable", "version": "v12.58.0", "source": { @@ -1457,6 +1565,58 @@ "time": "2026-03-30T19:05:19+00:00" }, { + "name": "illuminate/pipeline", + "version": "v12.58.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/pipeline.git", + "reference": "b6a14c20d69a44bf0a6fba664a00d23ca71770ee" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/pipeline/zipball/b6a14c20d69a44bf0a6fba664a00d23ca71770ee", + "reference": "b6a14c20d69a44bf0a6fba664a00d23ca71770ee", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^12.0", + "illuminate/macroable": "^12.0", + "illuminate/support": "^12.0", + "php": "^8.2" + }, + "suggest": { + "illuminate/database": "Required to use database transactions (^12.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Pipeline\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Pipeline package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2025-08-20T13:36:50+00:00" + }, + { "name": "illuminate/reflection", "version": "v12.58.0", "source": { @@ -1589,16 +1749,16 @@ }, { "name": "intervention/gif", - "version": "5.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/Intervention/gif.git", - "reference": "d856f59205aec768059d837148d755c079cdb94a" + "reference": "bb395af960deffe64d70c976b4df9283f68e762d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/gif/zipball/d856f59205aec768059d837148d755c079cdb94a", - "reference": "d856f59205aec768059d837148d755c079cdb94a", + "url": "https://api.github.com/repos/Intervention/gif/zipball/bb395af960deffe64d70c976b4df9283f68e762d", + "reference": "bb395af960deffe64d70c976b4df9283f68e762d", "shasum": "" }, "require": { @@ -1637,7 +1797,7 @@ ], "support": { "issues": "https://github.com/Intervention/gif/issues", - "source": "https://github.com/Intervention/gif/tree/5.0.0" + "source": "https://github.com/Intervention/gif/tree/5.0.1" }, "funding": [ { @@ -1653,7 +1813,7 @@ "type": "ko_fi" } ], - "time": "2026-03-21T05:08:17+00:00" + "time": "2026-05-03T06:04:47+00:00" }, { "name": "intervention/image", @@ -2265,6 +2425,52 @@ "time": "2024-09-21T08:32:55+00:00" }, { + "name": "lsces/illuminate-firebird", + "version": "V2.0.2", + "source": { + "type": "git", + "url": "https://github.com/lsces/illuminate-firebird.git", + "reference": "c59e7916c06f60543dce4e35c36bad0caaa6f551" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/lsces/illuminate-firebird/zipball/c59e7916c06f60543dce4e35c36bad0caaa6f551", + "reference": "c59e7916c06f60543dce4e35c36bad0caaa6f551", + "shasum": "" + }, + "require": { + "ext-pdo": "*", + "ext-pdo_firebird": "*", + "illuminate/container": "^12.0", + "illuminate/database": "^12.0", + "illuminate/events": "^12.0", + "illuminate/support": "^12.0", + "php": "^8.3" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Firebird\\Illuminate\\FirebirdServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Firebird\\Illuminate\\": "src/illuminate/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Firebird database driver for the illuminate database package of the Laravel Framework", + "support": { + "source": "https://github.com/lsces/illuminate-firebird/tree/V2.0.2" + }, + "time": "2026-03-06T15:27:25+00:00" + }, + { "name": "middlewares/client-ip", "version": "v2.1.0", "source": { @@ -3911,16 +4117,16 @@ }, { "name": "symfony/cache-contracts", - "version": "v3.6.0", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868" + "reference": "225e8a254166bd3442e370c6f50145465db63831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/5d68a57d66910405e5c0b63d6f0af941e66fc868", - "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/225e8a254166bd3442e370c6f50145465db63831", + "reference": "225e8a254166bd3442e370c6f50145465db63831", "shasum": "" }, "require": { @@ -3934,7 +4140,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -3967,7 +4173,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.7.0" }, "funding": [ { @@ -3979,11 +4185,15 @@ "type": "github" }, { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-13T15:25:07+00:00" + "time": "2026-05-05T15:33:14+00:00" }, { "name": "symfony/clock", @@ -4163,16 +4373,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.6.0", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" + "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", - "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b", + "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b", "shasum": "" }, "require": { @@ -4185,7 +4395,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -4210,7 +4420,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.0" }, "funding": [ { @@ -4222,11 +4432,15 @@ "type": "github" }, { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2026-04-13T15:52:40+00:00" }, { "name": "symfony/event-dispatcher", @@ -4315,16 +4529,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.6.0", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "59eb412e93815df44f05f342958efa9f46b1e586" + "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586", - "reference": "59eb412e93815df44f05f342958efa9f46b1e586", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/ccba7060602b7fed0b03c85bf025257f76d9ef32", + "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32", "shasum": "" }, "require": { @@ -4338,7 +4552,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -4371,7 +4585,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.0" }, "funding": [ { @@ -4383,11 +4597,15 @@ "type": "github" }, { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2026-01-05T13:30:16+00:00" }, { "name": "symfony/expression-language", @@ -5378,16 +5596,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.6.1", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43" + "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43", - "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a", + "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a", "shasum": "" }, "require": { @@ -5405,7 +5623,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -5441,7 +5659,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.6.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.7.0" }, "funding": [ { @@ -5461,7 +5679,7 @@ "type": "tidelift" } ], - "time": "2025-07-15T11:30:57+00:00" + "time": "2026-03-28T09:44:51+00:00" }, { "name": "symfony/string", @@ -5556,16 +5774,16 @@ }, { "name": "symfony/translation", - "version": "v7.4.8", + "version": "v7.4.10", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "33600f8489485425bfcddd0d983391038d3422e7" + "reference": "ada7578c30dd5feaa8259cff3e885069ea81ddde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/33600f8489485425bfcddd0d983391038d3422e7", - "reference": "33600f8489485425bfcddd0d983391038d3422e7", + "url": "https://api.github.com/repos/symfony/translation/zipball/ada7578c30dd5feaa8259cff3e885069ea81ddde", + "reference": "ada7578c30dd5feaa8259cff3e885069ea81ddde", "shasum": "" }, "require": { @@ -5632,7 +5850,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.4.8" + "source": "https://github.com/symfony/translation/tree/v7.4.10" }, "funding": [ { @@ -5652,20 +5870,20 @@ "type": "tidelift" } ], - "time": "2026-03-24T13:12:05+00:00" + "time": "2026-05-06T11:19:24+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.6.1", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "65a8bc82080447fae78373aa10f8d13b38338977" + "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977", - "reference": "65a8bc82080447fae78373aa10f8d13b38338977", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/0ab302977a952b42fd51475c4ebac81f8da0a95d", + "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d", "shasum": "" }, "require": { @@ -5678,7 +5896,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -5714,7 +5932,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.6.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.7.0" }, "funding": [ { @@ -5734,7 +5952,7 @@ "type": "tidelift" } ], - "time": "2025-07-15T13:41:35+00:00" + "time": "2026-01-05T13:30:16+00:00" }, { "name": "symfony/var-exporter", @@ -8009,16 +8227,16 @@ }, { "name": "symfony/config", - "version": "v7.4.9", + "version": "v7.4.10", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "d4a277b7a0f26487db16b264d935c617b7d994ea" + "reference": "d91b6c7cd2a8c9a9c2b8d26c8f5ed48edf99ef57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/d4a277b7a0f26487db16b264d935c617b7d994ea", - "reference": "d4a277b7a0f26487db16b264d935c617b7d994ea", + "url": "https://api.github.com/repos/symfony/config/zipball/d91b6c7cd2a8c9a9c2b8d26c8f5ed48edf99ef57", + "reference": "d91b6c7cd2a8c9a9c2b8d26c8f5ed48edf99ef57", "shasum": "" }, "require": { @@ -8064,7 +8282,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.4.9" + "source": "https://github.com/symfony/config/tree/v7.4.10" }, "funding": [ { @@ -8084,7 +8302,7 @@ "type": "tidelift" } ], - "time": "2026-04-29T14:25:20+00:00" + "time": "2026-05-03T14:20:49+00:00" }, { "name": "symfony/filesystem", @@ -8224,16 +8442,16 @@ }, { "name": "symfony/yaml", - "version": "v7.4.8", + "version": "v7.4.10", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c58fdf7b3d6c2995368264c49e4e8b05bcff2883" + "reference": "c660d6538545a3e8e65a5621ee3d7a6d352892c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c58fdf7b3d6c2995368264c49e4e8b05bcff2883", - "reference": "c58fdf7b3d6c2995368264c49e4e8b05bcff2883", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c660d6538545a3e8e65a5621ee3d7a6d352892c7", + "reference": "c660d6538545a3e8e65a5621ee3d7a6d352892c7", "shasum": "" }, "require": { @@ -8276,7 +8494,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.4.8" + "source": "https://github.com/symfony/yaml/tree/v7.4.10" }, "funding": [ { @@ -8296,7 +8514,7 @@ "type": "tidelift" } ], - "time": "2026-03-24T13:12:05+00:00" + "time": "2026-05-05T08:01:55+00:00" }, { "name": "theseer/tokenizer", |
