Merge branch 'develop'

Author: janpecha

.travis.yml

@@ -8,7 +8,7 @@ php:
     - 7.2
 
 script:
-    - vendor/bin/tester tests -s -p php -c tests/php-unix.ini
+    - vendor/bin/tester tests -s -p php
     - if [ "$TRAVIS_PHP_VERSION" = "7.2" ]; then php temp/code-checker/src/code-checker.php; fi
 
 after_failure:

readme.md

@@ -5,7 +5,7 @@ Lean Mapper
 
 [![Build Status](https://travis-ci.org/Tharos/LeanMapper.svg?branch=develop)](https://travis-ci.org/Tharos/LeanMapper)
 
-Lean Mapper is a tiny ORM based on powerful [dibi database abstraction library](http://dibiphp.com) for PHP.
+Lean Mapper is a tiny ORM based on powerful [Dibi database abstraction library](http://dibiphp.com) for PHP.
 
 See [www.leanmapper.com](http://www.leanmapper.com) for more informations, usage examples and documentation.
 

src/LeanMapper/DefaultMapper.php

@@ -92,9 +92,10 @@ public function getRelationshipTable($sourceTable, $targetTable)
     /**
      * {@inheritdoc}
      */
-    public function getRelationshipColumn($sourceTable, $targetTable)
+    public function getRelationshipColumn($sourceTable, $targetTable/*, $relationshipName = null*/)
     {
-        return $targetTable . '_' . $this->getPrimaryKey($targetTable);
+        $relationshipName = (func_num_args() === 3) ? func_get_arg(2) : null;
+        return (isset($relationshipName) ? $relationshipName : $targetTable) . '_' . $this->getPrimaryKey($targetTable);
     }
 
 
@@ -126,7 +127,7 @@ public function getImplicitFilters($entityClass, Caller $caller = null)
     /**
      * Trims namespace part from fully qualified class name
      *
-     * @param $class
+     * @param string $class
      * @return string
      */
     protected function trimNamespace($class)

src/LeanMapper/Entity.php

@@ -39,16 +39,16 @@ abstract class Entity
     /** @var Row */
     protected $row;
 
-    /** @var IMapper */
+    /** @var IMapper|null */
     protected $mapper;
 
-    /** @var IEntityFactory */
+    /** @var IEntityFactory|null */
     protected $entityFactory;
 
     /** @var EntityReflection[] */
     protected static $reflections = [];
 
-    /** @var EntityReflection */
+    /** @var EntityReflection|null */
     private $currentReflection;
 
 
@@ -506,7 +506,7 @@ public function __sleep()
 
 
     /**
-     * @param $property
+     * @param Property|string $property
      * @param array $filterArgs
      * @throws InvalidValueException
      * @throws InvalidStateException
@@ -858,7 +858,7 @@ protected function initDefaults()
      * @param Relationship\HasOne $relationship micro-optimalization
      * @param Filtering|null $filtering
      * @throws InvalidValueException
-     * @return Entity
+     * @return Entity|null
      */
     private function getHasOneValue(Property $property, Relationship\HasOne $relationship, Filtering $filtering = null)
     {
@@ -924,7 +924,7 @@ private function getHasManyValue(
      * @param Property $property
      * @param Relationship\BelongsToOne $relationship micro-optimalization
      * @param Filtering|null $filtering
-     * @return Entity
+     * @return Entity|null
      * @throws InvalidValueException
      */
     private function getBelongsToOneValue(Property $property, Relationship\BelongsToOne $relationship, Filtering $filtering = null)

src/LeanMapper/Filtering.php

@@ -45,7 +45,7 @@ class Filtering
      * @param array|null $args
      * @param Entity|null $entity
      * @param Property|null $property
-     * @param array|null $targetedArgs
+     * @param array $targetedArgs
      * @throws InvalidArgumentException
      */
     public function __construct($filters, array $args = null, Entity $entity = null, Property $property = null, array $targetedArgs = [])

src/LeanMapper/Fluent.php

@@ -33,7 +33,7 @@ class Fluent extends \Dibi\Fluent
         'DELETE' => ['DELETE', 'FROM', 'USING', 'WHERE', 'ORDER BY', 'LIMIT'],
     ];
 
-    /** @var array */
+    /** @var array|null */
     private $relatedKeys;
 
 
@@ -73,7 +73,7 @@ public function createSelect($args = null)
      *
      * @param string|null $clause
      * @param array|null $args
-     * @return string
+     * @return array
      */
     public function _export($clause = null, $args = null)
     {

src/LeanMapper/IMapper.php

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

src/LeanMapper/ImplicitFilters.php

@@ -32,7 +32,7 @@ class ImplicitFilters
 
     /**
      * @param array|string|Closure $filters
-     * @param array|null $targetedArgs
+     * @param array $targetedArgs
      * @throws InvalidArgumentException
      */
     public function __construct($filters, array $targetedArgs = [])

src/LeanMapper/Reflection/AliasesParser.php

@@ -46,7 +46,7 @@ public function __construct()
      *
      * @param string $source
      * @param string $namespace
-     * @return array
+     * @return Aliases
      */
     public static function parseSource($source, $namespace = '')
     {

src/LeanMapper/Reflection/AnnotationsParser.php

@@ -61,4 +61,20 @@ public static function parseAnnotationValues($annotation, $docComment)
         return $matches[1];
     }
 
+
+
+    /**
+     * Parse value pieces of requested multiline annotation from given doc comment
+     *
+     * @param string $annotation
+     * @param string $docComment
+     * @return array
+     */
+    public static function parseMultiLineAnnotationValues($annotation, $docComment)
+    {
+        $matches = [];
+        preg_match_all("#@$annotation\\h+([^\n\r@]+(?:\\s*\*\\h{2,}+[^\n\r@]+)*)#", $docComment, $matches);
+        return $matches[1];
+    }
+
 }