5.x

.env.mysql

@@ -0,0 +1,5 @@
+DB_PLATFORM=Mysql
+
+MYSQL_HOST=localhost
+MYSQL_USER=mysqluser
+MYSQL_PASS=mypass

.env.postgres

@@ -0,0 +1,6 @@
+DB_PLATFORM=Postgres
+
+PGSQL_HOST=localhost
+PGSQL_PORT=5432
+PGSQL_USER=pguser
+PGSQL_PASS=pgpass

.github/workflows/php.yml

@@ -0,0 +1,70 @@
+name: PHP Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [ 8.1, 8.2, 8.3 ]
+
+    env:
+      MYSQL_HOST: localhost
+      MYSQL_USER: root
+      MYSQL_PASS: root
+      PGSQL_HOST: localhost
+      PGSQL_USER: cormatest
+      PGSQL_PASS: cormatest
+      PGSQL_PORT: 5432
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Start MySQL
+        run: |
+          sudo systemctl start mysql
+
+      - name: Start PostgreSQL
+        run: |
+          sudo systemctl start postgresql
+          pg_isready
+
+      - name: Create test database
+        run: sudo -u postgres createdb $PGSQL_USER
+
+      - name: Create test postgres user
+        run: |
+          sudo -u postgres psql --command="CREATE USER $PGSQL_USER PASSWORD '$PGSQL_PASS'" --command="GRANT CREATE ON DATABASE $PGSQL_USER TO $PGSQL_USER"
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run unit tests
+        run: composer run-script test:unit
+
+      - name: Run mysql tests
+        run: composer run-script test:mysql
+
+      - name: Run postgres tests
+        run: composer run-script test:postgres

CHANGELOG.md

@@ -1,3 +1,27 @@
+Version 5.0
+=============
+
+New Features
+-----------
+- Add new way of loading relationships where relationships are defined via property attributes.
+- Add support for loading and saving polymorphic relationships where a class and id column can load an object of any class in a namespace.
+- Allow all specified relationships on a class to be loaded and saved with a single method call.
+- Add helper to repositories to join other tables that have a relationship defined on the current class.
+- Provides a framework where custom relationship types can be added or behavior for built-in types modified.
+
+Updates
+-------
+- Existing loadOne, loadMany, loadManyToMany as well as the RelationshipSaver and RelationshipLoader classes have been deprecated.
+- All exceptions throws extend from a common CormaException class
+- Updated to a fork of Doctrine DBAL 4.0 corma-dbal with the ability to introspect into QueryBuilders 
+
+Breaking Changes
+----------------
+
+* Legacy relationship load / save methods require that the property names and getter / setter names are consistent with the property name. They are not 100% backward compatible, and may require some renaming.
+* Many DBAL methods removed or changed, see [Doctrine Upgrade Guide](https://github.com/doctrine/dbal/blob/4.0.x/UPGRADE.md)
+* Namespace of the DBAL classes changes from Doctrine\DBAL to Corma\DBAL this should be fixable with a simple search + replace.
+
 Version 4.1.0
 =============
 

README.md

@@ -3,17 +3,14 @@ Corma
 
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE.txt)
-[![Build Status](https://api.travis-ci.org/thewunder/corma.svg?branch=master)](https://travis-ci.org/thewunder/corma)
-[![Coverage Status](https://coveralls.io/repos/github/thewunder/corma/badge.svg?branch=master)](https://coveralls.io/github/thewunder/corma?branch=master)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/3ab739ee-d54a-457d-9eec-43261102dfe4/mini.png)](https://insight.sensiolabs.com/projects/3ab739ee-d54a-457d-9eec-43261102dfe4)
 
 Corma is a high-performance, convention-based ORM based on Doctrine DBAL.
 
 Corma is great because:
 
 * No complex and difficult to verify annotations or configuration files
 * Promotes consistent code organization
-* Loads and saves one-to-one, one-to-many, and many-to-many relationships with a method call
+* Loads and saves one-to-one, one-to-many, many-to-many, and polymorphic relationships
 * Can save multiple objects in a single query (using an upsert)
 * Makes it easy to cache and avoid database queries
 * Supports soft deletes
@@ -32,26 +29,41 @@ Install via Composer
 
 Via the command line:
 
-    composer.phar require thewunder/corma ~4.0
+    composer.phar require thewunder/corma ^5.0
 
 Or add the following to the require section your composer.json:
 
-    "thewunder/corma": "~4.0"
+    "thewunder/corma": "^5.0"
 
-For PHP versions < 8.0 use Corma version ~3.0 
+For PHP versions < 8.1 use Corma version ~3.0 
 
 Basic Usage
 -----------
 Create a DataObject
+
 ```php
 namespace YourNamespace\Dataobjects;
 
+use Corma\Relationship\ManyToMany;
+use Corma\Relationship\OneToMany;
+use Corma\Relationship\OneToOne;
+
 class YourDataObject {
     protected $id;
 
     //If the property name == column name on the table your_data_objects it will be saved
     protected $myColumn;
 
+    protected ?int $otherObjectId = null;
+
+    #[OneToOne]
+    protected ?OtherObject $otherObject = null;
+
+    #[OneToMany(AnotherObject::class)]
+    protected ?array $anotherObjects = null;
+
+    #[ManyToMany(DifferentObject::class, 'your_data_object_different_link_table')]
+    protected ?array $differentObjects = null;
     //Getters and setters..
 }
 ```
@@ -79,7 +91,7 @@ $orm->save($object);
 //Call more setters on $object...
 $objects = [$object];
 $newObject = $orm->create(YourDataObject::class);
-//call setters on $newObject..
+//call setters on $newObject...
 $objects[] = $newObject;
 
 $orm->saveAll($objects);
@@ -91,9 +103,9 @@ $existingObject = $orm->find(YourDataObject::class, 5);
 $existingObjects = $orm->findBy(YourDataObject::class, ['myColumn >='=>42, 'otherColumn'=>1], ['sortColumn'=>'ASC']);
 
 //load relationships
-$orm->loadOne($existingObjects, OtherObject::class, 'otherObjectId');
-$orm->loadMany($existingObjects, AnotherObject::class, 'yourObjectId');
-$orm->loadManyToMany($existingObjects, DifferentObject::class, 'link_table');
+$orm->load($existingObjects, 'otherObject');
+$orm->load($existingObjects, 'anotherObjects');
+$orm->load($existingObjects, 'differentObjects');
 
 //delete those
 $orm->deleteAll($existingObjects);
@@ -112,5 +124,4 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 [ico-version]: https://img.shields.io/packagist/v/thewunder/corma.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
-
 [link-packagist]: https://packagist.org/packages/thewunder/corma

composer.json

@@ -21,20 +21,23 @@
     "php": ">=8.1",
     "ext-pdo" : "*",
     "ext-json": "*",
-    "doctrine/dbal": "^3.0",
     "doctrine/inflector": "^1.3||^2.0",
     "psr/event-dispatcher": "^1.0",
-    "psr/simple-cache": "^1.0||^2.0||^3.0"
+    "psr/simple-cache": "^2.0||^3.0",
+    "psr/container": "^2.0",
+    "thewunder/corma-dbal": "^1.0"
   },
   "require-dev": {
     "vlucas/phpdotenv": "~2.0",
-    "php-coveralls/php-coveralls": "~2.0",
     "phpunit/phpunit": "^10.0",
-    "symfony/event-dispatcher": "^6.0",
+    "symfony/event-dispatcher": "^6.0 || ^7.0",
     "rector/rector": "^1.0"
   },
   "scripts": {
-    "test": "vendor/bin/phpunit"
+    "test": "vendor/bin/phpunit",
+    "test:unit": "vendor/bin/phpunit --testsuite Unit",
+    "test:mysql": ["@putenv DB_PLATFORM=Mysql", "vendor/bin/phpunit --testsuite Integration"],
+    "test:postgres": ["@putenv DB_PLATFORM=Postgres", "vendor/bin/phpunit --testsuite Integration"]
   },
   "suggest": {
     "robmorgan/phinx": "*"

phpunit.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
   <testsuites>
-    <testsuite name="UnitTests">
-      <directory>test/</directory>
+    <testsuite name="Unit">
+      <directory>test/Unit</directory>
+    </testsuite>
+    <testsuite name="Integration">
+      <directory>test/Integration</directory>
     </testsuite>
   </testsuites>
   <source>

rector.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
 
 return RectorConfig::configure()
@@ -11,7 +12,7 @@
         __DIR__ . '/test',
     ])->withPhpSets()
     ->withSets([
-        Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_100
+        PHPUnitSetList::PHPUNIT_100
     ])
     ->withRules([
         AddVoidReturnTypeWhereNoReturnRector::class,

src/DataObject/Factory/ObjectFactoryInterface.php

@@ -1,7 +1,7 @@
 <?php
 namespace Corma\DataObject\Factory;
 
-use Doctrine\DBAL\Result;
+use Corma\DBAL\Result;
 
 /**
  * Manages the construction of objects

src/DataObject/Factory/PsrContainerObjectFactory.php

@@ -5,8 +5,8 @@
 
 
 use Corma\DataObject\Hydrator\ObjectHydratorInterface;
-use Doctrine\DBAL\Result;
-use Doctrine\DBAL\FetchMode;
+use Corma\DBAL\Result;
+use Corma\DBAL\FetchMode;
 use Psr\Container\ContainerInterface;
 
 /**

src/DataObject/Identifier/AutoIncrementIdentifier.php

@@ -18,7 +18,7 @@ public function __construct(Inflector $inflector, private readonly QueryHelperIn
     public function setNewId(object $object): object
     {
         $table = $this->convention->getTable($object);
-        return $this->setId($object, $this->queryHelper->getLastInsertId($table, $this->getIdColumn($object)));
+        return $this->setId($object, $this->queryHelper->getLastInsertId());
     }
 
     public function isNew($object): bool

src/DataObject/Identifier/CustomizableAutoIncrementIdentifier.php

@@ -1,7 +1,6 @@
 <?php
 namespace Corma\DataObject\Identifier;
 
-use Corma\DataObject\TableConvention\TableConventionInterface;
 use Corma\QueryHelper\QueryHelperInterface;
 use Corma\Util\Inflector;
 
@@ -10,15 +9,14 @@
  */
 class CustomizableAutoIncrementIdentifier extends CustomizableIdentifier
 {
-    public function __construct(Inflector $inflector, private readonly QueryHelperInterface $queryHelper, private readonly TableConventionInterface $convention)
+    public function __construct(Inflector $inflector, private readonly QueryHelperInterface $queryHelper)
     {
         parent::__construct($inflector);
     }
 
     public function setNewId(object $object): object
     {
-        $table = $this->convention->getTable($object);
-        return $this->setId($object, $this->queryHelper->getLastInsertId($table, $this->getIdColumn($object)));
+        return $this->setId($object, $this->queryHelper->getLastInsertId());
     }
 
     public function isNew(object $object): bool

src/DataObject/Identifier/IdColumn.php

@@ -2,7 +2,7 @@
 
 namespace Corma\DataObject\Identifier;
 
-#[\Attribute]
+#[\Attribute(\Attribute::TARGET_CLASS)]
 class IdColumn
 {
     public function __construct(private readonly string $column)

src/DataObject/ObjectManager.php

@@ -5,7 +5,7 @@
 use Corma\DataObject\Hydrator\ObjectHydratorInterface;
 use Corma\DataObject\Identifier\ObjectIdentifierInterface;
 use Corma\DataObject\TableConvention\TableConventionInterface;
-use Doctrine\DBAL\Result;
+use Corma\DBAL\Result;
 
 /**
  * Manages creation, hydration, and table name and id inspection for a particular class

src/DataObject/TableConvention/DbTable.php

@@ -3,7 +3,7 @@
 namespace Corma\DataObject\TableConvention;
 
 
-#[\Attribute]
+#[\Attribute(\Attribute::TARGET_CLASS)]
 class DbTable
 {
     public function __construct(private readonly string $table)

src/Exception/BadMethodCallException.php

@@ -4,7 +4,7 @@
 /**
  * Thrown when a method that should not be called is called
  */
-class BadMethodCallException extends \BadMethodCallException
+final class BadMethodCallException extends CormaException
 {
 
 }

src/Exception/ClassNotFoundException.php

@@ -4,7 +4,7 @@
 /**
  * Thrown when a class cannot be found by corma
  */
-class ClassNotFoundException extends \LogicException
+final class ClassNotFoundException extends CormaException
 {
 
 }

src/Exception/CormaException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Corma\Exception;
+
+abstract class CormaException extends \Exception
+{
+}

src/Exception/InvalidArgumentException.php

@@ -4,7 +4,7 @@
 /**
  * Thrown if one or more function arguments are invalid
  */
-class InvalidArgumentException extends \InvalidArgumentException
+final class InvalidArgumentException extends CormaException
 {
 
 }