@@ -35,117 +35,117 @@ |
||
| 35 | 35 | class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator |
| 36 | 36 | { |
| 37 | 37 | |
| 38 | - public function __get($var) |
|
| 39 | - { |
|
| 40 | - return $this->get($var); |
|
| 41 | - } |
|
| 42 | - |
|
| 43 | - /** |
|
| 44 | - * Returns true if a column is set, false otherwise. |
|
| 45 | - * |
|
| 46 | - * @param string $var |
|
| 47 | - * @return boolean |
|
| 48 | - */ |
|
| 49 | - public function __isset($var) |
|
| 50 | - { |
|
| 51 | - return $this->has($var); |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - public function __set($var, $value) |
|
| 55 | - { |
|
| 56 | - $this->set($var, $value); |
|
| 57 | - } |
|
| 58 | - |
|
| 59 | - /** |
|
| 60 | - * Implements array behaviour for our object. |
|
| 61 | - * |
|
| 62 | - * @param string $offset |
|
| 63 | - * @param string $value |
|
| 64 | - */ |
|
| 65 | - public function offsetSet($offset, $value) |
|
| 66 | - { |
|
| 67 | - $this->__set($offset, $value); |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * Implements array behaviour for our object. |
|
| 72 | - * |
|
| 73 | - * @param string $offset |
|
| 74 | - * @return bool |
|
| 75 | - */ |
|
| 76 | - public function offsetExists($offset) |
|
| 77 | - { |
|
| 78 | - $this->_dbLoadIfNotLoaded(); |
|
| 79 | - return isset($this->dbRow[$offset]); |
|
| 80 | - } |
|
| 81 | - |
|
| 82 | - /** |
|
| 83 | - * Implements array behaviour for our object. |
|
| 84 | - * |
|
| 85 | - * @param string $offset |
|
| 86 | - */ |
|
| 87 | - public function offsetUnset($offset) |
|
| 88 | - { |
|
| 89 | - $this->__set($offset, null); |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - /** |
|
| 93 | - * Implements array behaviour for our object. |
|
| 94 | - * |
|
| 95 | - * @param string $offset |
|
| 96 | - * @return mixed|null |
|
| 97 | - */ |
|
| 98 | - public function offsetGet($offset) |
|
| 99 | - { |
|
| 100 | - return $this->__get($offset); |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - private $_validIterator = false; |
|
| 104 | - |
|
| 105 | - /** |
|
| 106 | - * Implements iterator behaviour for our object (so we can each column). |
|
| 107 | - */ |
|
| 108 | - public function rewind() |
|
| 109 | - { |
|
| 110 | - $this->_dbLoadIfNotLoaded(); |
|
| 111 | - if (count($this->dbRow) > 0) { |
|
| 112 | - $this->_validIterator = true; |
|
| 113 | - } else { |
|
| 114 | - $this->_validIterator = false; |
|
| 115 | - } |
|
| 116 | - reset($this->dbRow); |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - /** |
|
| 120 | - * Implements iterator behaviour for our object (so we can each column). |
|
| 121 | - */ |
|
| 122 | - public function next() |
|
| 123 | - { |
|
| 124 | - $val = next($this->dbRow); |
|
| 125 | - $this->_validIterator = !($val === false); |
|
| 126 | - } |
|
| 127 | - |
|
| 128 | - /** |
|
| 129 | - * Implements iterator behaviour for our object (so we can each column). |
|
| 130 | - */ |
|
| 131 | - public function key() |
|
| 132 | - { |
|
| 133 | - return key($this->dbRow); |
|
| 134 | - } |
|
| 135 | - |
|
| 136 | - /** |
|
| 137 | - * Implements iterator behaviour for our object (so we can each column). |
|
| 138 | - */ |
|
| 139 | - public function current() |
|
| 140 | - { |
|
| 141 | - return current($this->dbRow); |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * Implements iterator behaviour for our object (so we can each column). |
|
| 146 | - */ |
|
| 147 | - public function valid() |
|
| 148 | - { |
|
| 149 | - return $this->_validIterator; |
|
| 150 | - } |
|
| 38 | + public function __get($var) |
|
| 39 | + { |
|
| 40 | + return $this->get($var); |
|
| 41 | + } |
|
| 42 | + |
|
| 43 | + /** |
|
| 44 | + * Returns true if a column is set, false otherwise. |
|
| 45 | + * |
|
| 46 | + * @param string $var |
|
| 47 | + * @return boolean |
|
| 48 | + */ |
|
| 49 | + public function __isset($var) |
|
| 50 | + { |
|
| 51 | + return $this->has($var); |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + public function __set($var, $value) |
|
| 55 | + { |
|
| 56 | + $this->set($var, $value); |
|
| 57 | + } |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * Implements array behaviour for our object. |
|
| 61 | + * |
|
| 62 | + * @param string $offset |
|
| 63 | + * @param string $value |
|
| 64 | + */ |
|
| 65 | + public function offsetSet($offset, $value) |
|
| 66 | + { |
|
| 67 | + $this->__set($offset, $value); |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * Implements array behaviour for our object. |
|
| 72 | + * |
|
| 73 | + * @param string $offset |
|
| 74 | + * @return bool |
|
| 75 | + */ |
|
| 76 | + public function offsetExists($offset) |
|
| 77 | + { |
|
| 78 | + $this->_dbLoadIfNotLoaded(); |
|
| 79 | + return isset($this->dbRow[$offset]); |
|
| 80 | + } |
|
| 81 | + |
|
| 82 | + /** |
|
| 83 | + * Implements array behaviour for our object. |
|
| 84 | + * |
|
| 85 | + * @param string $offset |
|
| 86 | + */ |
|
| 87 | + public function offsetUnset($offset) |
|
| 88 | + { |
|
| 89 | + $this->__set($offset, null); |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + /** |
|
| 93 | + * Implements array behaviour for our object. |
|
| 94 | + * |
|
| 95 | + * @param string $offset |
|
| 96 | + * @return mixed|null |
|
| 97 | + */ |
|
| 98 | + public function offsetGet($offset) |
|
| 99 | + { |
|
| 100 | + return $this->__get($offset); |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + private $_validIterator = false; |
|
| 104 | + |
|
| 105 | + /** |
|
| 106 | + * Implements iterator behaviour for our object (so we can each column). |
|
| 107 | + */ |
|
| 108 | + public function rewind() |
|
| 109 | + { |
|
| 110 | + $this->_dbLoadIfNotLoaded(); |
|
| 111 | + if (count($this->dbRow) > 0) { |
|
| 112 | + $this->_validIterator = true; |
|
| 113 | + } else { |
|
| 114 | + $this->_validIterator = false; |
|
| 115 | + } |
|
| 116 | + reset($this->dbRow); |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + /** |
|
| 120 | + * Implements iterator behaviour for our object (so we can each column). |
|
| 121 | + */ |
|
| 122 | + public function next() |
|
| 123 | + { |
|
| 124 | + $val = next($this->dbRow); |
|
| 125 | + $this->_validIterator = !($val === false); |
|
| 126 | + } |
|
| 127 | + |
|
| 128 | + /** |
|
| 129 | + * Implements iterator behaviour for our object (so we can each column). |
|
| 130 | + */ |
|
| 131 | + public function key() |
|
| 132 | + { |
|
| 133 | + return key($this->dbRow); |
|
| 134 | + } |
|
| 135 | + |
|
| 136 | + /** |
|
| 137 | + * Implements iterator behaviour for our object (so we can each column). |
|
| 138 | + */ |
|
| 139 | + public function current() |
|
| 140 | + { |
|
| 141 | + return current($this->dbRow); |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * Implements iterator behaviour for our object (so we can each column). |
|
| 146 | + */ |
|
| 147 | + public function valid() |
|
| 148 | + { |
|
| 149 | + return $this->_validIterator; |
|
| 150 | + } |
|
| 151 | 151 | } |
| 152 | 152 | \ No newline at end of file |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | if ($this->daoNamespace == null && $this->beanNamespace == null) { |
| 62 | - $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
| 62 | + $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
| 63 | 63 | |
| 64 | 64 | $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
| 65 | - if ($autoloadNamespaces) { |
|
| 65 | + if ($autoloadNamespaces) { |
|
| 66 | 66 | $this->autoloadDetected = true; |
| 67 | 67 | $rootNamespace = $autoloadNamespaces[0]; |
| 68 | 68 | $this->daoNamespace = $rootNamespace."Dao"; |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | $tdbmService = new InstanceProxy($name); |
| 140 | 140 | /* @var $tdbmService TDBMService */ |
| 141 | - $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc); |
|
| 141 | + $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc); |
|
| 142 | 142 | |
| 143 | 143 | |
| 144 | 144 | $moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS); |
@@ -109,12 +109,12 @@ discard block |
||
| 109 | 109 | $this->beanNamespace = $this->moufManager->getVariable("tdbmDefaultBeanNamespace_tdbmService"); |
| 110 | 110 | |
| 111 | 111 | if ($this->daoNamespace == null && $this->beanNamespace == null) { |
| 112 | - $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
| 112 | + $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
| 113 | 113 | |
| 114 | - $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
|
| 114 | + $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
|
| 115 | 115 | if ($autoloadNamespaces) { |
| 116 | 116 | $this->autoloadDetected = true; |
| 117 | - $rootNamespace = $autoloadNamespaces[0]; |
|
| 117 | + $rootNamespace = $autoloadNamespaces[0]; |
|
| 118 | 118 | $this->daoNamespace = $rootNamespace."Dao"; |
| 119 | 119 | $this->beanNamespace = $rootNamespace."Dao\\Bean"; |
| 120 | 120 | } else { |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * @param string $selfedit |
| 145 | 145 | * @throws \Mouf\MoufException |
| 146 | 146 | */ |
| 147 | - public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") { |
|
| 147 | + public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") { |
|
| 148 | 148 | $this->selfedit = $selfedit; |
| 149 | 149 | |
| 150 | 150 | if ($selfedit == "true") { |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | private function getAllPossiblePaths() { |
| 48 | - return AmbiguityException::getAllPossiblePathsRec($this->paths); |
|
| 48 | + return AmbiguityException::getAllPossiblePathsRec($this->paths); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | private static function getAllPossiblePathsRec($sub_table_paths) |
@@ -25,10 +25,10 @@ |
||
| 25 | 25 | * @author David Negrier |
| 26 | 26 | */ |
| 27 | 27 | final class TDBMObjectStateEnum extends AbstractTDBMObject { |
| 28 | - const STATE_DETACHED = "detached"; |
|
| 29 | - const STATE_NEW = "new"; |
|
| 30 | - const STATE_NOT_LOADED = "not loaded"; |
|
| 31 | - const STATE_LOADED = "loaded"; |
|
| 32 | - const STATE_DIRTY = "dirty"; |
|
| 33 | - const STATE_DELETED = "deleted"; |
|
| 28 | + const STATE_DETACHED = "detached"; |
|
| 29 | + const STATE_NEW = "new"; |
|
| 30 | + const STATE_NOT_LOADED = "not loaded"; |
|
| 31 | + const STATE_LOADED = "loaded"; |
|
| 32 | + const STATE_DIRTY = "dirty"; |
|
| 33 | + const STATE_DELETED = "deleted"; |
|
| 34 | 34 | } |
@@ -65,9 +65,9 @@ |
||
| 65 | 65 | * @param string $func_name |
| 66 | 66 | * @param $values |
| 67 | 67 | * @return array|void |
| 68 | - * @throws TDBMException |
|
| 68 | + * @throws TDBMException |
|
| 69 | 69 | */ |
| 70 | - public function __call($func_name, $values) { |
|
| 70 | + public function __call($func_name, $values) { |
|
| 71 | 71 | |
| 72 | 72 | if (strpos($func_name,"getarray_") === 0) { |
| 73 | 73 | $column = substr($func_name, 9); |
@@ -9,85 +9,85 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | class MapIterator implements Iterator { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * @var Iterator |
|
| 14 | - */ |
|
| 15 | - protected $iterator; |
|
| 12 | + /** |
|
| 13 | + * @var Iterator |
|
| 14 | + */ |
|
| 15 | + protected $iterator; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * @var callable Modifies the current item in iterator |
|
| 19 | - */ |
|
| 20 | - protected $callable; |
|
| 17 | + /** |
|
| 18 | + * @var callable Modifies the current item in iterator |
|
| 19 | + */ |
|
| 20 | + protected $callable; |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * @param $iterator Iterator|array |
|
| 24 | - * @param $callable callable This can have two parameters |
|
| 25 | - * @throws TDBMException |
|
| 26 | - */ |
|
| 27 | - public function __construct($iterator, callable $callable) { |
|
| 28 | - if (is_array($iterator)) { |
|
| 29 | - $this->iterator = new \ArrayIterator($iterator); |
|
| 30 | - } |
|
| 31 | - elseif (!($iterator instanceof Iterator)) |
|
| 32 | - { |
|
| 33 | - throw new TDBMException("\$iterator parameter must be an instance of Iterator"); |
|
| 34 | - } |
|
| 35 | - else |
|
| 36 | - { |
|
| 37 | - $this->iterator = $iterator; |
|
| 38 | - } |
|
| 22 | + /** |
|
| 23 | + * @param $iterator Iterator|array |
|
| 24 | + * @param $callable callable This can have two parameters |
|
| 25 | + * @throws TDBMException |
|
| 26 | + */ |
|
| 27 | + public function __construct($iterator, callable $callable) { |
|
| 28 | + if (is_array($iterator)) { |
|
| 29 | + $this->iterator = new \ArrayIterator($iterator); |
|
| 30 | + } |
|
| 31 | + elseif (!($iterator instanceof Iterator)) |
|
| 32 | + { |
|
| 33 | + throw new TDBMException("\$iterator parameter must be an instance of Iterator"); |
|
| 34 | + } |
|
| 35 | + else |
|
| 36 | + { |
|
| 37 | + $this->iterator = $iterator; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - if ($callable instanceof \Closure) { |
|
| 41 | - // make sure there's one argument |
|
| 42 | - $reflection = new \ReflectionObject($callable); |
|
| 43 | - if ($reflection->hasMethod('__invoke')) { |
|
| 44 | - $method = $reflection->getMethod('__invoke'); |
|
| 45 | - if ($method->getNumberOfParameters() !== 1) { |
|
| 46 | - throw new TDBMException("\$callable must accept one and only one parameter."); |
|
| 47 | - } |
|
| 48 | - } |
|
| 49 | - } |
|
| 40 | + if ($callable instanceof \Closure) { |
|
| 41 | + // make sure there's one argument |
|
| 42 | + $reflection = new \ReflectionObject($callable); |
|
| 43 | + if ($reflection->hasMethod('__invoke')) { |
|
| 44 | + $method = $reflection->getMethod('__invoke'); |
|
| 45 | + if ($method->getNumberOfParameters() !== 1) { |
|
| 46 | + throw new TDBMException("\$callable must accept one and only one parameter."); |
|
| 47 | + } |
|
| 48 | + } |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - $this->callable = $callable; |
|
| 52 | - } |
|
| 51 | + $this->callable = $callable; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * Alters the current item with $this->callable and returns a new item. |
|
| 56 | - * Be careful with your types as we can't do static type checking here! |
|
| 57 | - * @return mixed |
|
| 58 | - */ |
|
| 59 | - public function current() |
|
| 60 | - { |
|
| 61 | - $callable = $this->callable; |
|
| 62 | - return $callable($this->iterator->current()); |
|
| 63 | - } |
|
| 54 | + /** |
|
| 55 | + * Alters the current item with $this->callable and returns a new item. |
|
| 56 | + * Be careful with your types as we can't do static type checking here! |
|
| 57 | + * @return mixed |
|
| 58 | + */ |
|
| 59 | + public function current() |
|
| 60 | + { |
|
| 61 | + $callable = $this->callable; |
|
| 62 | + return $callable($this->iterator->current()); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - public function next() |
|
| 66 | - { |
|
| 67 | - $this->iterator->next(); |
|
| 68 | - } |
|
| 65 | + public function next() |
|
| 66 | + { |
|
| 67 | + $this->iterator->next(); |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - public function key() |
|
| 71 | - { |
|
| 72 | - return $this->iterator->key(); |
|
| 73 | - } |
|
| 70 | + public function key() |
|
| 71 | + { |
|
| 72 | + return $this->iterator->key(); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - public function valid() |
|
| 76 | - { |
|
| 77 | - return $this->iterator->valid(); |
|
| 78 | - } |
|
| 75 | + public function valid() |
|
| 76 | + { |
|
| 77 | + return $this->iterator->valid(); |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - public function rewind() |
|
| 81 | - { |
|
| 82 | - $this->iterator->rewind(); |
|
| 83 | - } |
|
| 80 | + public function rewind() |
|
| 81 | + { |
|
| 82 | + $this->iterator->rewind(); |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - /** |
|
| 86 | - * Casts the iterator to a PHP array. |
|
| 87 | - * |
|
| 88 | - * @return array |
|
| 89 | - */ |
|
| 90 | - public function toArray() { |
|
| 91 | - return iterator_to_array($this); |
|
| 92 | - } |
|
| 85 | + /** |
|
| 86 | + * Casts the iterator to a PHP array. |
|
| 87 | + * |
|
| 88 | + * @return array |
|
| 89 | + */ |
|
| 90 | + public function toArray() { |
|
| 91 | + return iterator_to_array($this); |
|
| 92 | + } |
|
| 93 | 93 | } |
@@ -14,122 +14,122 @@ discard block |
||
| 14 | 14 | class ObjectBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor |
| 15 | 15 | { |
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * @var ForeignKeyConstraint |
|
| 19 | - */ |
|
| 20 | - private $foreignKey; |
|
| 21 | - |
|
| 22 | - /** |
|
| 23 | - * @var SchemaAnalyzer |
|
| 24 | - */ |
|
| 25 | - private $schemaAnalyzer; |
|
| 26 | - |
|
| 27 | - public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) { |
|
| 28 | - parent::__construct($table); |
|
| 29 | - $this->foreignKey = $foreignKey; |
|
| 30 | - $this->schemaAnalyzer = $schemaAnalyzer; |
|
| 31 | - } |
|
| 32 | - |
|
| 33 | - |
|
| 34 | - |
|
| 35 | - /** |
|
| 36 | - * Returns the foreignkey the column is part of, if any. null otherwise. |
|
| 37 | - * |
|
| 38 | - * @return ForeignKeyConstraint|null |
|
| 39 | - */ |
|
| 40 | - public function getForeignKey() { |
|
| 41 | - return $this->foreignKey; |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - /** |
|
| 45 | - * Returns the name of the class linked to this property or null if this is not a foreign key |
|
| 46 | - * @return null|string |
|
| 47 | - */ |
|
| 48 | - public function getClassName() { |
|
| 49 | - return TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName()); |
|
| 50 | - } |
|
| 51 | - |
|
| 52 | - /** |
|
| 53 | - * Returns the param annotation for this property (useful for constructor). |
|
| 54 | - * |
|
| 55 | - * @return string |
|
| 56 | - */ |
|
| 57 | - public function getParamAnnotation() { |
|
| 58 | - $str = " * @param %s %s"; |
|
| 59 | - return sprintf($str, $this->getClassName(), $this->getVariableName()); |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - public function getUpperCamelCaseName() { |
|
| 63 | - // First, are there many column or only one? |
|
| 64 | - // If one column, we name the setter after it. Otherwise, we name the setter after the table name |
|
| 65 | - if (count($this->foreignKey->getLocalColumns()) > 1) { |
|
| 66 | - $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName())); |
|
| 67 | - if ($this->alternativeName) { |
|
| 68 | - $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns()); |
|
| 69 | - |
|
| 70 | - $name .= 'By'.implode('And', $camelizedColumns); |
|
| 71 | - } |
|
| 72 | - } else { |
|
| 73 | - $column = $this->foreignKey->getLocalColumns()[0]; |
|
| 74 | - // Let's remove any _id or id_. |
|
| 75 | - if (strpos(strtolower($column), "id_") === 0) { |
|
| 76 | - $column = substr($column, 3); |
|
| 77 | - } |
|
| 78 | - if (strrpos(strtolower($column), "_id") === strlen($column)-3) { |
|
| 79 | - $column = substr($column, 0, strlen($column)-3); |
|
| 80 | - } |
|
| 81 | - $name = TDBMDaoGenerator::toCamelCase($column); |
|
| 82 | - if ($this->alternativeName) { |
|
| 83 | - $name .= 'Object'; |
|
| 84 | - } |
|
| 85 | - } |
|
| 86 | - return $name; |
|
| 87 | - } |
|
| 88 | - |
|
| 89 | - /** |
|
| 90 | - * Returns true if the property is compulsory (and therefore should be fetched in the constructor). |
|
| 91 | - * @return bool |
|
| 92 | - */ |
|
| 93 | - public function isCompulsory() { |
|
| 94 | - // Are all columns nullable? |
|
| 95 | - $localColumnNames = $this->foreignKey->getLocalColumns(); |
|
| 96 | - |
|
| 97 | - foreach ($localColumnNames as $name) { |
|
| 98 | - $column = $this->table->getColumn($name); |
|
| 99 | - if ($column->getNotnull()) { |
|
| 100 | - return true; |
|
| 101 | - } |
|
| 102 | - } |
|
| 103 | - |
|
| 104 | - return false; |
|
| 105 | - } |
|
| 106 | - |
|
| 107 | - /** |
|
| 108 | - * Returns true if the property is the primary key |
|
| 109 | - * @return bool |
|
| 110 | - */ |
|
| 111 | - public function isPrimaryKey() { |
|
| 112 | - $fkColumns = $this->foreignKey->getLocalColumns(); |
|
| 113 | - sort($fkColumns); |
|
| 114 | - |
|
| 115 | - $pkColumns = $this->table->getPrimaryKeyColumns(); |
|
| 116 | - sort($pkColumns); |
|
| 117 | - |
|
| 118 | - return $fkColumns == $pkColumns; |
|
| 119 | - } |
|
| 120 | - |
|
| 121 | - /** |
|
| 122 | - * Returns the PHP code for getters and setters |
|
| 123 | - * @return string |
|
| 124 | - */ |
|
| 125 | - public function getGetterSetterCode() { |
|
| 126 | - $tableName = $this->table->getName(); |
|
| 127 | - $getterName = $this->getGetterName(); |
|
| 128 | - $setterName = $this->getSetterName(); |
|
| 129 | - |
|
| 130 | - $referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName()); |
|
| 131 | - |
|
| 132 | - $str = ' /** |
|
| 17 | + /** |
|
| 18 | + * @var ForeignKeyConstraint |
|
| 19 | + */ |
|
| 20 | + private $foreignKey; |
|
| 21 | + |
|
| 22 | + /** |
|
| 23 | + * @var SchemaAnalyzer |
|
| 24 | + */ |
|
| 25 | + private $schemaAnalyzer; |
|
| 26 | + |
|
| 27 | + public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) { |
|
| 28 | + parent::__construct($table); |
|
| 29 | + $this->foreignKey = $foreignKey; |
|
| 30 | + $this->schemaAnalyzer = $schemaAnalyzer; |
|
| 31 | + } |
|
| 32 | + |
|
| 33 | + |
|
| 34 | + |
|
| 35 | + /** |
|
| 36 | + * Returns the foreignkey the column is part of, if any. null otherwise. |
|
| 37 | + * |
|
| 38 | + * @return ForeignKeyConstraint|null |
|
| 39 | + */ |
|
| 40 | + public function getForeignKey() { |
|
| 41 | + return $this->foreignKey; |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + /** |
|
| 45 | + * Returns the name of the class linked to this property or null if this is not a foreign key |
|
| 46 | + * @return null|string |
|
| 47 | + */ |
|
| 48 | + public function getClassName() { |
|
| 49 | + return TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName()); |
|
| 50 | + } |
|
| 51 | + |
|
| 52 | + /** |
|
| 53 | + * Returns the param annotation for this property (useful for constructor). |
|
| 54 | + * |
|
| 55 | + * @return string |
|
| 56 | + */ |
|
| 57 | + public function getParamAnnotation() { |
|
| 58 | + $str = " * @param %s %s"; |
|
| 59 | + return sprintf($str, $this->getClassName(), $this->getVariableName()); |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + public function getUpperCamelCaseName() { |
|
| 63 | + // First, are there many column or only one? |
|
| 64 | + // If one column, we name the setter after it. Otherwise, we name the setter after the table name |
|
| 65 | + if (count($this->foreignKey->getLocalColumns()) > 1) { |
|
| 66 | + $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName())); |
|
| 67 | + if ($this->alternativeName) { |
|
| 68 | + $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns()); |
|
| 69 | + |
|
| 70 | + $name .= 'By'.implode('And', $camelizedColumns); |
|
| 71 | + } |
|
| 72 | + } else { |
|
| 73 | + $column = $this->foreignKey->getLocalColumns()[0]; |
|
| 74 | + // Let's remove any _id or id_. |
|
| 75 | + if (strpos(strtolower($column), "id_") === 0) { |
|
| 76 | + $column = substr($column, 3); |
|
| 77 | + } |
|
| 78 | + if (strrpos(strtolower($column), "_id") === strlen($column)-3) { |
|
| 79 | + $column = substr($column, 0, strlen($column)-3); |
|
| 80 | + } |
|
| 81 | + $name = TDBMDaoGenerator::toCamelCase($column); |
|
| 82 | + if ($this->alternativeName) { |
|
| 83 | + $name .= 'Object'; |
|
| 84 | + } |
|
| 85 | + } |
|
| 86 | + return $name; |
|
| 87 | + } |
|
| 88 | + |
|
| 89 | + /** |
|
| 90 | + * Returns true if the property is compulsory (and therefore should be fetched in the constructor). |
|
| 91 | + * @return bool |
|
| 92 | + */ |
|
| 93 | + public function isCompulsory() { |
|
| 94 | + // Are all columns nullable? |
|
| 95 | + $localColumnNames = $this->foreignKey->getLocalColumns(); |
|
| 96 | + |
|
| 97 | + foreach ($localColumnNames as $name) { |
|
| 98 | + $column = $this->table->getColumn($name); |
|
| 99 | + if ($column->getNotnull()) { |
|
| 100 | + return true; |
|
| 101 | + } |
|
| 102 | + } |
|
| 103 | + |
|
| 104 | + return false; |
|
| 105 | + } |
|
| 106 | + |
|
| 107 | + /** |
|
| 108 | + * Returns true if the property is the primary key |
|
| 109 | + * @return bool |
|
| 110 | + */ |
|
| 111 | + public function isPrimaryKey() { |
|
| 112 | + $fkColumns = $this->foreignKey->getLocalColumns(); |
|
| 113 | + sort($fkColumns); |
|
| 114 | + |
|
| 115 | + $pkColumns = $this->table->getPrimaryKeyColumns(); |
|
| 116 | + sort($pkColumns); |
|
| 117 | + |
|
| 118 | + return $fkColumns == $pkColumns; |
|
| 119 | + } |
|
| 120 | + |
|
| 121 | + /** |
|
| 122 | + * Returns the PHP code for getters and setters |
|
| 123 | + * @return string |
|
| 124 | + */ |
|
| 125 | + public function getGetterSetterCode() { |
|
| 126 | + $tableName = $this->table->getName(); |
|
| 127 | + $getterName = $this->getGetterName(); |
|
| 128 | + $setterName = $this->getSetterName(); |
|
| 129 | + |
|
| 130 | + $referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName()); |
|
| 131 | + |
|
| 132 | + $str = ' /** |
|
| 133 | 133 | * Returns the '.$referencedBeanName.' object bound to this object via the '.implode(" and ", $this->foreignKey->getLocalColumns()).' column. |
| 134 | 134 | * |
| 135 | 135 | * @return '.$referencedBeanName.' |
@@ -148,19 +148,19 @@ discard block |
||
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | '; |
| 151 | - return $str; |
|
| 152 | - } |
|
| 153 | - |
|
| 154 | - /** |
|
| 155 | - * Returns the part of code useful when doing json serialization. |
|
| 156 | - * |
|
| 157 | - * @return string |
|
| 158 | - */ |
|
| 159 | - public function getJsonSerializeCode() |
|
| 160 | - { |
|
| 161 | - return ' if (!$stopRecursion) { |
|
| 151 | + return $str; |
|
| 152 | + } |
|
| 153 | + |
|
| 154 | + /** |
|
| 155 | + * Returns the part of code useful when doing json serialization. |
|
| 156 | + * |
|
| 157 | + * @return string |
|
| 158 | + */ |
|
| 159 | + public function getJsonSerializeCode() |
|
| 160 | + { |
|
| 161 | + return ' if (!$stopRecursion) { |
|
| 162 | 162 | $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName().'()->jsonSerialize(true); |
| 163 | 163 | } |
| 164 | 164 | '; |
| 165 | - } |
|
| 165 | + } |
|
| 166 | 166 | } |
@@ -12,88 +12,88 @@ discard block |
||
| 12 | 12 | */ |
| 13 | 13 | class ScalarBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * @var Column |
|
| 17 | - */ |
|
| 18 | - private $column; |
|
| 19 | - |
|
| 20 | - |
|
| 21 | - public function __construct(Table $table, Column $column) { |
|
| 22 | - parent::__construct($table); |
|
| 23 | - $this->table = $table; |
|
| 24 | - $this->column = $column; |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - /** |
|
| 28 | - * Returns the foreignkey the column is part of, if any. null otherwise. |
|
| 29 | - * |
|
| 30 | - * @param Column $column |
|
| 31 | - * @return ForeignKeyConstraint|null |
|
| 32 | - */ |
|
| 33 | - public function getForeignKey() { |
|
| 34 | - return false; |
|
| 35 | - } |
|
| 36 | - |
|
| 37 | - /** |
|
| 38 | - * Returns the param annotation for this property (useful for constructor). |
|
| 39 | - * |
|
| 40 | - * @return string |
|
| 41 | - */ |
|
| 42 | - public function getParamAnnotation() { |
|
| 43 | - $className = $this->getClassName(); |
|
| 44 | - $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType()); |
|
| 45 | - |
|
| 46 | - $str = " * @param %s %s"; |
|
| 47 | - return sprintf($str, $paramType, $this->getVariableName()); |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - public function getUpperCamelCaseName() { |
|
| 51 | - return TDBMDaoGenerator::toCamelCase($this->column->getName()); |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * Returns the name of the class linked to this property or null if this is not a foreign key |
|
| 56 | - * @return null|string |
|
| 57 | - */ |
|
| 58 | - public function getClassName() { |
|
| 59 | - return null; |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - /** |
|
| 63 | - * Returns true if the property is compulsory (and therefore should be fetched in the constructor). |
|
| 64 | - * @return bool |
|
| 65 | - */ |
|
| 66 | - public function isCompulsory() { |
|
| 67 | - return $this->column->getNotnull() && !$this->column->getAutoincrement(); |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * Returns true if the property is the primary key |
|
| 72 | - * @return bool |
|
| 73 | - */ |
|
| 74 | - public function isPrimaryKey() { |
|
| 75 | - return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns()); |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - /** |
|
| 79 | - * Returns the PHP code for getters and setters |
|
| 80 | - * @return string |
|
| 81 | - */ |
|
| 82 | - public function getGetterSetterCode() { |
|
| 83 | - |
|
| 84 | - $type = $this->column->getType(); |
|
| 85 | - $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type); |
|
| 86 | - |
|
| 87 | - $columnGetterName = $this->getGetterName(); |
|
| 88 | - $columnSetterName = $this->getSetterName(); |
|
| 89 | - |
|
| 90 | - if ($normalizedType == "\\DateTimeInterface") { |
|
| 91 | - $castTo = "\\DateTimeInterface "; |
|
| 92 | - } else { |
|
| 93 | - $castTo = ""; |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - $getterAndSetterCode = ' /** |
|
| 15 | + /** |
|
| 16 | + * @var Column |
|
| 17 | + */ |
|
| 18 | + private $column; |
|
| 19 | + |
|
| 20 | + |
|
| 21 | + public function __construct(Table $table, Column $column) { |
|
| 22 | + parent::__construct($table); |
|
| 23 | + $this->table = $table; |
|
| 24 | + $this->column = $column; |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + /** |
|
| 28 | + * Returns the foreignkey the column is part of, if any. null otherwise. |
|
| 29 | + * |
|
| 30 | + * @param Column $column |
|
| 31 | + * @return ForeignKeyConstraint|null |
|
| 32 | + */ |
|
| 33 | + public function getForeignKey() { |
|
| 34 | + return false; |
|
| 35 | + } |
|
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * Returns the param annotation for this property (useful for constructor). |
|
| 39 | + * |
|
| 40 | + * @return string |
|
| 41 | + */ |
|
| 42 | + public function getParamAnnotation() { |
|
| 43 | + $className = $this->getClassName(); |
|
| 44 | + $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType()); |
|
| 45 | + |
|
| 46 | + $str = " * @param %s %s"; |
|
| 47 | + return sprintf($str, $paramType, $this->getVariableName()); |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + public function getUpperCamelCaseName() { |
|
| 51 | + return TDBMDaoGenerator::toCamelCase($this->column->getName()); |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * Returns the name of the class linked to this property or null if this is not a foreign key |
|
| 56 | + * @return null|string |
|
| 57 | + */ |
|
| 58 | + public function getClassName() { |
|
| 59 | + return null; |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + /** |
|
| 63 | + * Returns true if the property is compulsory (and therefore should be fetched in the constructor). |
|
| 64 | + * @return bool |
|
| 65 | + */ |
|
| 66 | + public function isCompulsory() { |
|
| 67 | + return $this->column->getNotnull() && !$this->column->getAutoincrement(); |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * Returns true if the property is the primary key |
|
| 72 | + * @return bool |
|
| 73 | + */ |
|
| 74 | + public function isPrimaryKey() { |
|
| 75 | + return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns()); |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + /** |
|
| 79 | + * Returns the PHP code for getters and setters |
|
| 80 | + * @return string |
|
| 81 | + */ |
|
| 82 | + public function getGetterSetterCode() { |
|
| 83 | + |
|
| 84 | + $type = $this->column->getType(); |
|
| 85 | + $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type); |
|
| 86 | + |
|
| 87 | + $columnGetterName = $this->getGetterName(); |
|
| 88 | + $columnSetterName = $this->getSetterName(); |
|
| 89 | + |
|
| 90 | + if ($normalizedType == "\\DateTimeInterface") { |
|
| 91 | + $castTo = "\\DateTimeInterface "; |
|
| 92 | + } else { |
|
| 93 | + $castTo = ""; |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + $getterAndSetterCode = ' /** |
|
| 97 | 97 | * The getter for the "%s" column. |
| 98 | 98 | * |
| 99 | 99 | * @return %s |
@@ -112,40 +112,40 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | '; |
| 115 | - return sprintf($getterAndSetterCode, |
|
| 116 | - // Getter |
|
| 117 | - $this->column->getName(), |
|
| 118 | - $normalizedType, |
|
| 119 | - $columnGetterName, |
|
| 120 | - var_export($this->column->getName(), true), |
|
| 121 | - var_export($this->table->getName(), true), |
|
| 122 | - // Setter |
|
| 123 | - $this->column->getName(), |
|
| 124 | - $normalizedType, |
|
| 125 | - $this->column->getName(), |
|
| 126 | - $columnSetterName, |
|
| 127 | - $castTo, |
|
| 128 | - $this->column->getName(), |
|
| 129 | - var_export($this->column->getName(), true), |
|
| 130 | - $this->column->getName(), |
|
| 131 | - var_export($this->table->getName(), true) |
|
| 132 | - ); |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - /** |
|
| 136 | - * Returns the part of code useful when doing json serialization. |
|
| 137 | - * |
|
| 138 | - * @return string |
|
| 139 | - */ |
|
| 140 | - public function getJsonSerializeCode() |
|
| 141 | - { |
|
| 142 | - $type = $this->column->getType(); |
|
| 143 | - $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type); |
|
| 144 | - |
|
| 145 | - if ($normalizedType == "\\DateTimeInterface") { |
|
| 146 | - return ' $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."()->format('c');\n"; |
|
| 147 | - } else { |
|
| 148 | - return ' $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n"; |
|
| 149 | - } |
|
| 150 | - } |
|
| 115 | + return sprintf($getterAndSetterCode, |
|
| 116 | + // Getter |
|
| 117 | + $this->column->getName(), |
|
| 118 | + $normalizedType, |
|
| 119 | + $columnGetterName, |
|
| 120 | + var_export($this->column->getName(), true), |
|
| 121 | + var_export($this->table->getName(), true), |
|
| 122 | + // Setter |
|
| 123 | + $this->column->getName(), |
|
| 124 | + $normalizedType, |
|
| 125 | + $this->column->getName(), |
|
| 126 | + $columnSetterName, |
|
| 127 | + $castTo, |
|
| 128 | + $this->column->getName(), |
|
| 129 | + var_export($this->column->getName(), true), |
|
| 130 | + $this->column->getName(), |
|
| 131 | + var_export($this->table->getName(), true) |
|
| 132 | + ); |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + /** |
|
| 136 | + * Returns the part of code useful when doing json serialization. |
|
| 137 | + * |
|
| 138 | + * @return string |
|
| 139 | + */ |
|
| 140 | + public function getJsonSerializeCode() |
|
| 141 | + { |
|
| 142 | + $type = $this->column->getType(); |
|
| 143 | + $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type); |
|
| 144 | + |
|
| 145 | + if ($normalizedType == "\\DateTimeInterface") { |
|
| 146 | + return ' $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."()->format('c');\n"; |
|
| 147 | + } else { |
|
| 148 | + return ' $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n"; |
|
| 149 | + } |
|
| 150 | + } |
|
| 151 | 151 | } |