[WIP] Introducing data-mapper and unit of work.

UPDATE.md

@@ -38,8 +38,8 @@ The generated model is automatically updated once you rebuild your model.
 The classes used by Propel internally to build the object model were renamed. This affects your project if you extended one of these classes.
 
     Replace...                       With...
-    OMBuilder.php                    AbstractOMBuilder.php
-    ObjectBuilder.php                AbstractObjectBuilder.php
+    OMBuilder.php                    AbstractBuilder.php
+    ObjectBuilder.php                __removed__   
     PeerBuilder.php                  __removed__
     PHP5ExtensionObjectBuilder.php   ExtensionObjectBuilder.php
     PHP5ExtensionPeerBuilder.php     __removed__

autoload.php.dist

@@ -8,10 +8,10 @@ if (file_exists($file = __DIR__.'/vendor/autoload.php')) {
     $loader->add('Propel\Tests', array(
         __DIR__ . '/tests',
         __DIR__ . '/tests/Fixtures/bookstore/build/classes',
+        __DIR__ . '/tests/Fixtures/bookstore-packaged/build/classes',
         __DIR__ . '/tests/Fixtures/schemas/build/classes',
         __DIR__ . '/tests/Fixtures/quoting/build/classes'
     ));
-    $loader->register();
 } elseif (file_exists($file = __DIR__ . '/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php')) {
     require_once $file;
 

composer.json

@@ -22,8 +22,11 @@
         "symfony/finder": "~2.3",
         "symfony/validator": "~2.3",
         "symfony/filesystem": "~2.3",
+        "symfony/event-dispatcher": "~2.3",
         "symfony/config": "~2.3",
-        "psr/log": "~1.0"
+        "psr/log": "~1.0",
+        "gossi/php-code-generator": "dev-master",
+        "mustache/mustache": "~2.6"
     },
     "require-dev": {
         "behat/behat": "~2.4",
@@ -36,6 +39,9 @@
     "autoload": {
         "psr-0": {
             "Propel": "src/"
+        },
+        "psr-4": {
+            "MJS\\TopSort\\": "/Users/marc/bude/topsort/src/"
         }
     },
     "bin": [

resources/dtd/database.dtd

@@ -21,7 +21,7 @@ PHP class or method name.
               to lowercase.
 -->
 
-<!ELEMENT database (external-schema*, table+, behavior*)>
+<!ELEMENT database (external-schema*, entity+, behavior*)>
 <!ATTLIST database
   name CDATA #IMPLIED
   defaultIdMethod (native|none) "none"
@@ -47,10 +47,10 @@ PHP class or method name.
      note: the interface="true", requires that useManagers=true in the
      properties file.
 -->
-<!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter|behavior|vendor)*)>
-<!ATTLIST table
+<!ELEMENT entity (field+,(relation|index|unique|id-method-parameter|behavior|vendor)*)>
+<!ATTLIST entity
   name CDATA #REQUIRED
-  phpName CDATA #IMPLIED
+  tableName CDATA #IMPLIED
   idMethod (native|autoincrement|sequence|none|null) "null"
   skipSql (true|false) "false"
   readOnly (true|false) "false"
@@ -63,7 +63,7 @@ PHP class or method name.
   baseClass CDATA #IMPLIED
   alias CDATA #IMPLIED
   interface CDATA #IMPLIED
-  phpNamingMethod (nochange|underscore|phpname) #IMPLIED
+  tableNamingMethod (nochange|underscore|phpname) #IMPLIED
   heavyIndexing (true|false) #IMPLIED
   identifierQuoting (true|false) #IMPLIED
   description CDATA #IMPLIED
@@ -76,11 +76,9 @@ PHP class or method name.
   value CDATA #REQUIRED
 >
 
-<!ELEMENT column ((inheritance|vendor)*)>
-<!ATTLIST column
+<!ELEMENT field ((inheritance|vendor)*)>
+<!ATTLIST field
   name CDATA #REQUIRED
-  phpName CDATA #IMPLIED
-  tableMapName CDATA #IMPLIED
   primaryKey (true|false) "false"
   required (true|false) "false"
   type
@@ -116,13 +114,13 @@ PHP class or method name.
   extends CDATA #IMPLIED
 >
 
-<!ELEMENT foreign-key (reference+, vendor*)>
-<!ATTLIST foreign-key
-  foreignTable CDATA #REQUIRED
-  foreignSchema CDATA #IMPLIED
+<!ELEMENT relation (reference*, vendor*)>
+<!ATTLIST relation
+  target CDATA #REQUIRED
+  field CDATA #IMPLIED
   name CDATA #IMPLIED
-  phpName CDATA #IMPLIED
-  refPhpName CDATA #IMPLIED
+  refFieldName CDATA #IMPLIED
+  refName CDATA #IMPLIED
   onUpdate (CASCADE|cascade|SETNULL|setnull|RESTRICT|restrict|NONE|none) "none"
   onDelete (CASCADE|cascade|SETNULL|setnull|RESTRICT|restrict|NONE|none) "none"
   skipSql (true|false) "false"
@@ -134,7 +132,7 @@ PHP class or method name.
   foreign CDATA #REQUIRED
 >
 
-<!ELEMENT index (index-column+,vendor*)>
+<!ELEMENT index (index-field+,vendor*)>
 <!ATTLIST index
   name CDATA #IMPLIED
 >
@@ -144,19 +142,19 @@ PHP class or method name.
   name CDATA #IMPLIED
 >
 
-<!ELEMENT index-column (vendor*)>
-<!ATTLIST index-column
+<!ELEMENT index-field (vendor*)>
+<!ATTLIST index-field
   name CDATA #REQUIRED
   size CDATA #IMPLIED
 >
 
-<!ELEMENT unique (unique-column+)>
+<!ELEMENT unique (unique-field+)>
 <!ATTLIST unique
   name CDATA #IMPLIED
 >
 
-<!ELEMENT unique-column (vendor*)>
-<!ATTLIST unique-column
+<!ELEMENT unique-field (vendor*)>
+<!ATTLIST unique-field
   name CDATA #REQUIRED
 >
 

src/Propel/Common/Config/ConfigurationManager.php

@@ -80,8 +80,8 @@ public function getSection($section)
      * is expressed by:
      * <code>'database.adapter.mysql.tableType</code>
      *
-     * @param $name The name of property, expressed as a dot separated level hierarchy
-     * @throws Propel\Common\Config\Exception\InvalidArgumentException
+     * @param string $name The name of property, expressed as a dot separated level hierarchy
+     * @throws \Propel\Common\Config\Exception\InvalidArgumentException
      * @return mixed The configuration property
      */
     public function getConfigProperty($name)
@@ -164,16 +164,16 @@ protected function load($fileName, $extraConf)
             $finder->in($dirs)->depth(0)->files()->name($fileName . '.{php,inc,ini,properties,yaml,yml,xml,json}');
             $files = iterator_to_array($finder);
 
-            $distfinder = new Finder();
-            $distfinder->in($dirs)->depth(0)->files()->name($fileName . '.{php,inc,ini,properties,yaml,yml,xml,json}.dist');
-            $distfiles = iterator_to_array($distfinder);
+            $distFinder = new Finder();
+            $distFinder->in($dirs)->depth(0)->files()->name($fileName . '.{php,inc,ini,properties,yaml,yml,xml,json}.dist');
+            $distFiles = iterator_to_array($distFinder);
 
             $numFiles = count($files);
-            $numDistFiles = count($distfiles);
+            $numDistFiles = count($distFiles);
 
             //allow to load only .dist file
             if (0 === $numFiles && 1 === $numDistFiles) {
-                $files = $distfiles;
+                $files = $distFiles;
                 $numFiles = 1;
             }
 
@@ -212,7 +212,7 @@ protected function load($fileName, $extraConf)
     protected function process($extraConf = null)
     {
         if (null === $extraConf && count($this->config) <= 0) {
-            return null;
+            return;
         }
 
         $processor = new Processor();

src/Propel/Common/Config/PropelConfiguration.php

@@ -214,7 +214,7 @@ protected function addRuntimeSection(ArrayNodeDefinition $node)
                     ->addDefaultsIfNotSet()
                     ->fixXmlConfig('connection')
                     ->children()
-                        ->scalarNode('defaultConnection')->isRequired()->end()
+                        ->scalarNode('defaultConnection')->defaultValue('default')->end()
                         ->arrayNode('connections')
                             ->prototype('scalar')->end()
                         ->end()
@@ -283,8 +283,6 @@ protected function addGeneratorSection(ArrayNodeDefinition $node)
                     ->fixXmlConfig('connection')
                     ->children()
                         ->scalarNode('defaultConnection')->isRequired()->end()
-                        ->scalarNode('tablePrefix')->end()
-                        ->scalarNode('platformClass')->defaultValue('\\Propel\\Generator\\Platform\\MysqlPlatform')->end()
                         ->scalarNode('targetPackage')->end()
                         ->booleanNode('packageObjectModel')->defaultTrue()->end()
                         ->booleanNode('namespaceAutoPackage')->defaultTrue()->end()
@@ -330,14 +328,17 @@ protected function addGeneratorSection(ArrayNodeDefinition $node)
                                     ->addDefaultsIfNotSet()
                                     ->children()
                                         ->scalarNode('object')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\ObjectBuilder')->end()
-                                        ->scalarNode('objectstub')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\ExtensionObjectBuilder')->end()
+                                        ->scalarNode('activerecordtrait')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\ActiveRecordTraitBuilder')->end()
                                         ->scalarNode('objectmultiextend')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\MultiExtendObjectBuilder')->end()
+                                        ->scalarNode('repository')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\RepositoryBuilder')->end()
+                                        ->scalarNode('repositorystub')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\StubRepositoryBuilder')->end()
                                         ->scalarNode('query')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\QueryBuilder')->end()
-                                        ->scalarNode('querystub')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\ExtensionQueryBuilder')->end()
+                                        ->scalarNode('proxy')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\ProxyBuilder')->end()
+                                        ->scalarNode('querystub')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\StubQueryBuilder')->end()
                                         ->scalarNode('queryinheritance')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\QueryInheritanceBuilder')->end()
-                                        ->scalarNode('queryinheritancestub')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\ExtensionQueryInheritanceBuilder')->end()
-                                        ->scalarNode('tablemap')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\TableMapBuilder')->end()
-                                        ->scalarNode('interface')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\InterfaceBuilder')->end()
+                                        ->scalarNode('queryinheritancestub')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\StubQueryInheritanceBuilder')->end()
+                                        ->scalarNode('inheritanceentitymap')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\EntityMapInheritanceBuilder')->end()
+                                        ->scalarNode('entitymap')->cannotBeEmpty()->defaultValue('\Propel\Generator\Builder\Om\EntityMapBuilder')->end()
                                         ->scalarNode('datasql')->cannotBeEmpty()->end()
                                     ->end()
                                 ->end()

src/Propel/Generator/Behavior/AggregateColumn/AggregateColumnBehavior.php → src/Propel/Generator/Behavior/AggregateField/AggregateFieldBehavior.php

@@ -8,24 +8,24 @@
  * @license MIT License
  */
 
-namespace Propel\Generator\Behavior\AggregateColumn;
+namespace Propel\Generator\Behavior\AggregateField;
 
-use Propel\Generator\Builder\Om\ObjectBuilder;
+use Propel\Generator\Builder\Om\AbstractBuilder;
 use Propel\Generator\Model\Behavior;
 
 /**
  * Keeps an aggregate column updated with related table
  *
  * @author François Zaninotto
  */
-class AggregateColumnBehavior extends Behavior
+class AggregateFieldBehavior extends Behavior
 {
     // default parameters value
     protected $parameters = array(
         'name'           => null,
         'expression'     => null,
         'condition'      => null,
-        'foreign_table'  => null,
+        'foreign_entity'  => null,
         'foreign_schema' => null,
     );
 
@@ -64,13 +64,13 @@ public function modifyTable()
             $relationBehavior->setName('aggregate_column_relation');
             $relationBehavior->setId('aggregate_column_relation_'.$this->getId());
             $relationBehavior->addParameter(array('name' => 'foreign_table', 'value' => $table->getName()));
-            $relationBehavior->addParameter(array('name' => 'aggregate_name', 'value' => $this->getColumn()->getPhpName()));
-            $relationBehavior->addParameter(array('name' => 'update_method', 'value' => 'update' . $this->getColumn()->getPhpName()));
+            $relationBehavior->addParameter(array('name' => 'aggregate_name', 'value' => $this->getColumn()->getName()));
+            $relationBehavior->addParameter(array('name' => 'update_method', 'value' => 'update' . $this->getColumn()->getName()));
             $foreignTable->addBehavior($relationBehavior);
         }
     }
 
-    public function objectMethods(ObjectBuilder $builder)
+    public function objectMethods(AbstractBuilder $builder)
     {
         if (!$this->getParameter('foreign_table')) {
             throw new \InvalidArgumentException(sprintf('You must define a \'foreign_table\' parameter for the \'aggregate_column\' behavior in the \'%s\' table', $this->getTable()->getName()));
@@ -86,7 +86,7 @@ public function objectMethods(ObjectBuilder $builder)
      * @param ObjectBuilder $builder
      * @return string
      */
-    protected function addObjectCompute(ObjectBuilder $builder)
+    protected function addObjectCompute(AbstractBuilder $builder)
     {
         $conditions = array();
         if ($this->getParameter('condition')) {
@@ -97,7 +97,7 @@ protected function addObjectCompute(ObjectBuilder $builder)
         $database = $this->getTable()->getDatabase();
         foreach ($this->getForeignKey()->getColumnObjectsMapping() as $index => $columnReference) {
             $conditions[] = $columnReference['local']->getFullyQualifiedName() . ' = :p' . ($index + 1);
-            $bindings[$index + 1]   = $columnReference['foreign']->getPhpName();
+            $bindings[$index + 1]   = $columnReference['foreign']->getName();
         }
         $tableName = $database->getTablePrefix() . $this->getParameter('foreign_table');
         if ($database->getPlatform()->supportsSchemas() && $this->getParameter('foreign_schema')) {

src/Propel/Generator/Behavior/AggregateColumn/AggregateColumnRelationBehavior.php → src/Propel/Generator/Behavior/AggregateField/AggregateFieldRelationBehavior.php

@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Generator\Behavior\AggregateColumn;
+namespace Propel\Generator\Behavior\AggregateField;
 
 use Propel\Generator\Model\Behavior;
 
@@ -17,11 +17,11 @@
  *
  * @author François Zaninotto
  */
-class AggregateColumnRelationBehavior extends Behavior
+class AggregateFieldRelationBehavior extends Behavior
 {
     // default parameters value
     protected $parameters = array(
-        'foreign_table'     => '',
+        'foreign_entity'     => '',
         'update_method'     => '',
         'aggregate_name'    => '',
     );
@@ -140,7 +140,7 @@ protected function addQueryFindRelated($builder)
         $relationName = $this->getRelationName($builder);
 
         $builder->declareClassNamespace(
-            $foreignKey->getForeignTable()->getPhpName() . 'Query',
+            $foreignKey->getForeignTable()->getName() . 'Query',
             $foreignKey->getForeignTable()->getNamespace()
         );
 
@@ -168,7 +168,7 @@ protected function addQueryUpdateRelated($builder)
 
     protected function getForeignTable()
     {
-        return $this->getTable()->getDatabase()->getTable($this->getParameter('foreign_table'));
+        return $this->getEntity()->getDatabase()->getEntity($this->getParameter('foreign_entity'));
     }
 
     protected function getForeignKey()

src/Propel/Generator/Behavior/AggregateColumn/templates/objectCompute.php → src/Propel/Generator/Behavior/AggregateField/templates/objectCompute.php

@@ -6,7 +6,7 @@
  *
  * @return mixed The scalar result from the aggregate query
  */
-public function compute<?=$column->getPhpName()?>(ConnectionInterface $con)
+public function compute<?=$column->getName()?>(ConnectionInterface $con)
 {
     $stmt = $con->prepare('<?=$sql?>');
 <?php foreach ($bindings as $key => $binding):?>

src/Propel/Generator/Behavior/AggregateField/templates/objectUpdate.php

@@ -0,0 +1,11 @@
+
+/**
+ * Updates the aggregate column <?=$column->getName()?>
+ *
+ * @param ConnectionInterface $con A connection object
+ */
+public function update<?=$column->getName()?>(ConnectionInterface $con)
+{
+    $this->set<?=$column->getName()?>($this->compute<?=$column->getName()?>($con));
+    $this->save($con);
+}

src/Propel/Generator/Behavior/AggregateColumn/templates/queryFindRelated.php → src/Propel/Generator/Behavior/AggregateField/templates/queryFindRelated.php

@@ -1,6 +1,6 @@
 
 /**
- * Finds the related <?=$foreignTable->getPhpName()?> objects and keep them for later
+ * Finds the related <?=$foreignTable->getName()?> objects and keep them for later
  *
  * @param ConnectionInterface $con A connection object
  */

src/Propel/Generator/Behavior/Archivable/templates/objectArchive.php

@@ -21,7 +21,7 @@ public function archive(ConnectionInterface $con = null)
     }
     $this->copyInto($archive, $deepCopy = false, $makeNew = false);
 <?php if ($archivedAtColumn): ?>
-    $archive->set<?php echo $archivedAtColumn->getPhpName() ?>(time());
+    $archive->set<?php echo $archivedAtColumn->getName() ?>(time());
 <?php endif; ?>
     $archive->save(<?php if (!$hasArchiveClass): ?>$con<?php endif; ?>);