WIP: fixed coding style & more

Author: janpecha

src/LeanMapper/DefaultMapper.php

@@ -94,12 +94,7 @@ public function getRelationshipTable($sourceTable, $targetTable)
      */
     public function getRelationshipColumn($sourceTable, $targetTable/*, $relationshipName = null*/)
     {
-        $relationshipName = NULL;
-
-        if (func_num_args() === 3) {
-            $relationshipName = func_get_arg(2);
-        }
-
+        $relationshipName = (func_num_args() === 3) ? func_get_arg(2) : null;
         return (isset($relationshipName) ? $relationshipName : $targetTable) . '_' . $this->getPrimaryKey($targetTable);
     }
 

src/LeanMapper/IMapper.php

@@ -88,7 +88,7 @@ public function getRelationshipTable($sourceTable, $targetTable);
      *
      * @param string $sourceTable
      * @param string $targetTable
-     * @param string|NULL $relationshipName
+     * @param string|null $relationshipName
      * @return string
      */
     public function getRelationshipColumn($sourceTable, $targetTable/*, $relationshipName = null*/);

tests/LeanMapper/PrimaryEqualsForeign.phpt

@@ -72,14 +72,15 @@ class Mapper extends DefaultMapper
 
 
 
-    public function getRelationshipColumn($sourceTable, $targetTable, $relationshipName = null)
+    public function getRelationshipColumn($sourceTable, $targetTable/*, $relationshipName = null*/)
     {
         if ($sourceTable === 'authorcontract' and $targetTable === 'authordetail') {
             return 'author_id';
         }
         if ($sourceTable === 'authordetail' and $targetTable === 'author') {
             return 'author_id';
         }
+        $relationshipName = (func_num_args() === 3) ? func_get_arg(2) : null;
         return parent::getRelationshipColumn($sourceTable, $targetTable, $relationshipName);
     }