@@ -8,7 +8,7 @@ |
||
| 8 | 8 | <input type="hidden" id="selfedit" name="selfedit" value="<?php echo plainstring_to_htmlprotected($this->selfedit) ?>" /> |
| 9 | 9 | |
| 10 | 10 | <?php if (!$this->autoloadDetected) { |
| 11 | - ?> |
|
| 11 | + ?> |
|
| 12 | 12 | <div class="alert">Warning! TDBM could not detect the autoload section of your composer.json file. |
| 13 | 13 | Unless you are developing your own autoload system, you should configure <strong>composer.json</strong> to <a href="http://getcomposer.org/doc/01-basic-usage.md#autoloading" target="_blank">define a source directory and a root namespace using PSR-0</a>.</div> |
| 14 | 14 | <?php |
@@ -124,7 +124,7 @@ |
||
| 124 | 124 | public function getIncomingForeignKeys($tableName) |
| 125 | 125 | { |
| 126 | 126 | $junctionTables = $this->schemaAnalyzer->detectJunctionTables(); |
| 127 | - $junctionTableNames = array_map(function (Table $table) { return $table->getName(); }, $junctionTables); |
|
| 127 | + $junctionTableNames = array_map(function(Table $table) { return $table->getName(); }, $junctionTables); |
|
| 128 | 128 | $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName); |
| 129 | 129 | |
| 130 | 130 | $fks = []; |
@@ -14,136 +14,136 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | class TDBMSchemaAnalyzer |
| 16 | 16 | { |
| 17 | - private $connection; |
|
| 18 | - |
|
| 19 | - /** |
|
| 20 | - * @var Schema |
|
| 21 | - */ |
|
| 22 | - private $schema; |
|
| 23 | - |
|
| 24 | - /** |
|
| 25 | - * @var string |
|
| 26 | - */ |
|
| 27 | - private $cachePrefix; |
|
| 28 | - |
|
| 29 | - /** |
|
| 30 | - * @var Cache |
|
| 31 | - */ |
|
| 32 | - private $cache; |
|
| 33 | - |
|
| 34 | - /** |
|
| 35 | - * @var SchemaAnalyzer |
|
| 36 | - */ |
|
| 37 | - private $schemaAnalyzer; |
|
| 38 | - |
|
| 39 | - /** |
|
| 40 | - * @param Connection $connection The DBAL DB connection to use |
|
| 41 | - * @param Cache $cache A cache service to be used |
|
| 42 | - * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths... |
|
| 43 | - * Will be automatically created if not passed. |
|
| 44 | - */ |
|
| 45 | - public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) |
|
| 46 | - { |
|
| 47 | - $this->connection = $connection; |
|
| 48 | - $this->cache = $cache; |
|
| 49 | - $this->schemaAnalyzer = $schemaAnalyzer; |
|
| 50 | - } |
|
| 51 | - |
|
| 52 | - /** |
|
| 53 | - * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection. |
|
| 54 | - * |
|
| 55 | - * @return string |
|
| 56 | - */ |
|
| 57 | - public function getCachePrefix() |
|
| 58 | - { |
|
| 59 | - if ($this->cachePrefix === null) { |
|
| 60 | - $this->cachePrefix = hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName()); |
|
| 61 | - } |
|
| 62 | - |
|
| 63 | - return $this->cachePrefix; |
|
| 64 | - } |
|
| 65 | - |
|
| 66 | - /** |
|
| 67 | - * Returns the (cached) schema. |
|
| 68 | - * |
|
| 69 | - * @return Schema |
|
| 70 | - */ |
|
| 71 | - public function getSchema() |
|
| 72 | - { |
|
| 73 | - if ($this->schema === null) { |
|
| 74 | - $cacheKey = $this->getCachePrefix().'_schema'; |
|
| 75 | - if ($this->cache->contains($cacheKey)) { |
|
| 76 | - $this->schema = $this->cache->fetch($cacheKey); |
|
| 77 | - } else { |
|
| 78 | - $this->schema = $this->connection->getSchemaManager()->createSchema(); |
|
| 79 | - $this->cache->save($cacheKey, $this->schema); |
|
| 80 | - } |
|
| 81 | - } |
|
| 82 | - |
|
| 83 | - return $this->schema; |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - /** |
|
| 87 | - * Returns the list of pivot tables linked to table $tableName. |
|
| 88 | - * |
|
| 89 | - * @param string $tableName |
|
| 90 | - * |
|
| 91 | - * @return array|string[] |
|
| 92 | - */ |
|
| 93 | - public function getPivotTableLinkedToTable($tableName) |
|
| 94 | - { |
|
| 95 | - $cacheKey = $this->getCachePrefix().'_pivottables_link_'.$tableName; |
|
| 96 | - if ($this->cache->contains($cacheKey)) { |
|
| 97 | - return $this->cache->fetch($cacheKey); |
|
| 98 | - } |
|
| 99 | - |
|
| 100 | - $pivotTables = []; |
|
| 101 | - |
|
| 102 | - $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true); |
|
| 103 | - foreach ($junctionTables as $table) { |
|
| 104 | - $fks = $table->getForeignKeys(); |
|
| 105 | - foreach ($fks as $fk) { |
|
| 106 | - if ($fk->getForeignTableName() == $tableName) { |
|
| 107 | - $pivotTables[] = $table->getName(); |
|
| 108 | - break; |
|
| 109 | - } |
|
| 110 | - } |
|
| 111 | - } |
|
| 112 | - |
|
| 113 | - $this->cache->save($cacheKey, $pivotTables); |
|
| 114 | - |
|
| 115 | - return $pivotTables; |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - /** |
|
| 119 | - * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys |
|
| 120 | - * from junction tables and from inheritance. |
|
| 121 | - * |
|
| 122 | - * @return ForeignKeyConstraint[] |
|
| 123 | - */ |
|
| 124 | - public function getIncomingForeignKeys($tableName) |
|
| 125 | - { |
|
| 126 | - $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true); |
|
| 127 | - $junctionTableNames = array_map(function (Table $table) { return $table->getName(); }, $junctionTables); |
|
| 128 | - $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName); |
|
| 129 | - |
|
| 130 | - $fks = []; |
|
| 131 | - foreach ($this->getSchema()->getTables() as $table) { |
|
| 132 | - foreach ($table->getForeignKeys() as $fk) { |
|
| 133 | - if ($fk->getForeignTableName() === $tableName) { |
|
| 134 | - if (in_array($fk->getLocalTableName(), $junctionTableNames)) { |
|
| 135 | - continue; |
|
| 136 | - } |
|
| 137 | - foreach ($childrenRelationships as $childFk) { |
|
| 138 | - if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) { |
|
| 139 | - continue 2; |
|
| 140 | - } |
|
| 141 | - } |
|
| 142 | - $fks[] = $fk; |
|
| 143 | - } |
|
| 144 | - } |
|
| 145 | - } |
|
| 146 | - |
|
| 147 | - return $fks; |
|
| 148 | - } |
|
| 17 | + private $connection; |
|
| 18 | + |
|
| 19 | + /** |
|
| 20 | + * @var Schema |
|
| 21 | + */ |
|
| 22 | + private $schema; |
|
| 23 | + |
|
| 24 | + /** |
|
| 25 | + * @var string |
|
| 26 | + */ |
|
| 27 | + private $cachePrefix; |
|
| 28 | + |
|
| 29 | + /** |
|
| 30 | + * @var Cache |
|
| 31 | + */ |
|
| 32 | + private $cache; |
|
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * @var SchemaAnalyzer |
|
| 36 | + */ |
|
| 37 | + private $schemaAnalyzer; |
|
| 38 | + |
|
| 39 | + /** |
|
| 40 | + * @param Connection $connection The DBAL DB connection to use |
|
| 41 | + * @param Cache $cache A cache service to be used |
|
| 42 | + * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths... |
|
| 43 | + * Will be automatically created if not passed. |
|
| 44 | + */ |
|
| 45 | + public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) |
|
| 46 | + { |
|
| 47 | + $this->connection = $connection; |
|
| 48 | + $this->cache = $cache; |
|
| 49 | + $this->schemaAnalyzer = $schemaAnalyzer; |
|
| 50 | + } |
|
| 51 | + |
|
| 52 | + /** |
|
| 53 | + * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection. |
|
| 54 | + * |
|
| 55 | + * @return string |
|
| 56 | + */ |
|
| 57 | + public function getCachePrefix() |
|
| 58 | + { |
|
| 59 | + if ($this->cachePrefix === null) { |
|
| 60 | + $this->cachePrefix = hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName()); |
|
| 61 | + } |
|
| 62 | + |
|
| 63 | + return $this->cachePrefix; |
|
| 64 | + } |
|
| 65 | + |
|
| 66 | + /** |
|
| 67 | + * Returns the (cached) schema. |
|
| 68 | + * |
|
| 69 | + * @return Schema |
|
| 70 | + */ |
|
| 71 | + public function getSchema() |
|
| 72 | + { |
|
| 73 | + if ($this->schema === null) { |
|
| 74 | + $cacheKey = $this->getCachePrefix().'_schema'; |
|
| 75 | + if ($this->cache->contains($cacheKey)) { |
|
| 76 | + $this->schema = $this->cache->fetch($cacheKey); |
|
| 77 | + } else { |
|
| 78 | + $this->schema = $this->connection->getSchemaManager()->createSchema(); |
|
| 79 | + $this->cache->save($cacheKey, $this->schema); |
|
| 80 | + } |
|
| 81 | + } |
|
| 82 | + |
|
| 83 | + return $this->schema; |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + /** |
|
| 87 | + * Returns the list of pivot tables linked to table $tableName. |
|
| 88 | + * |
|
| 89 | + * @param string $tableName |
|
| 90 | + * |
|
| 91 | + * @return array|string[] |
|
| 92 | + */ |
|
| 93 | + public function getPivotTableLinkedToTable($tableName) |
|
| 94 | + { |
|
| 95 | + $cacheKey = $this->getCachePrefix().'_pivottables_link_'.$tableName; |
|
| 96 | + if ($this->cache->contains($cacheKey)) { |
|
| 97 | + return $this->cache->fetch($cacheKey); |
|
| 98 | + } |
|
| 99 | + |
|
| 100 | + $pivotTables = []; |
|
| 101 | + |
|
| 102 | + $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true); |
|
| 103 | + foreach ($junctionTables as $table) { |
|
| 104 | + $fks = $table->getForeignKeys(); |
|
| 105 | + foreach ($fks as $fk) { |
|
| 106 | + if ($fk->getForeignTableName() == $tableName) { |
|
| 107 | + $pivotTables[] = $table->getName(); |
|
| 108 | + break; |
|
| 109 | + } |
|
| 110 | + } |
|
| 111 | + } |
|
| 112 | + |
|
| 113 | + $this->cache->save($cacheKey, $pivotTables); |
|
| 114 | + |
|
| 115 | + return $pivotTables; |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + /** |
|
| 119 | + * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys |
|
| 120 | + * from junction tables and from inheritance. |
|
| 121 | + * |
|
| 122 | + * @return ForeignKeyConstraint[] |
|
| 123 | + */ |
|
| 124 | + public function getIncomingForeignKeys($tableName) |
|
| 125 | + { |
|
| 126 | + $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true); |
|
| 127 | + $junctionTableNames = array_map(function (Table $table) { return $table->getName(); }, $junctionTables); |
|
| 128 | + $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName); |
|
| 129 | + |
|
| 130 | + $fks = []; |
|
| 131 | + foreach ($this->getSchema()->getTables() as $table) { |
|
| 132 | + foreach ($table->getForeignKeys() as $fk) { |
|
| 133 | + if ($fk->getForeignTableName() === $tableName) { |
|
| 134 | + if (in_array($fk->getLocalTableName(), $junctionTableNames)) { |
|
| 135 | + continue; |
|
| 136 | + } |
|
| 137 | + foreach ($childrenRelationships as $childFk) { |
|
| 138 | + if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) { |
|
| 139 | + continue 2; |
|
| 140 | + } |
|
| 141 | + } |
|
| 142 | + $fks[] = $fk; |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | + |
|
| 147 | + return $fks; |
|
| 148 | + } |
|
| 149 | 149 | } |
@@ -31,117 +31,117 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | class WeakrefObjectStorage |
| 33 | 33 | { |
| 34 | - /** |
|
| 35 | - * An array of fetched object, accessible via table name and primary key. |
|
| 36 | - * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
| 37 | - * |
|
| 38 | - * @var array<string, WeakMap<string, TDBMObject>> |
|
| 39 | - */ |
|
| 40 | - private $objects = array(); |
|
| 34 | + /** |
|
| 35 | + * An array of fetched object, accessible via table name and primary key. |
|
| 36 | + * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
| 37 | + * |
|
| 38 | + * @var array<string, WeakMap<string, TDBMObject>> |
|
| 39 | + */ |
|
| 40 | + private $objects = array(); |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances |
|
| 44 | - * are removed if they are no more valid. |
|
| 45 | - * This is to avoid having memory used by dangling WeakRef instances. |
|
| 46 | - * |
|
| 47 | - * @var int |
|
| 48 | - */ |
|
| 49 | - private $garbageCollectorCount = 0; |
|
| 42 | + /** |
|
| 43 | + * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances |
|
| 44 | + * are removed if they are no more valid. |
|
| 45 | + * This is to avoid having memory used by dangling WeakRef instances. |
|
| 46 | + * |
|
| 47 | + * @var int |
|
| 48 | + */ |
|
| 49 | + private $garbageCollectorCount = 0; |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * Sets an object in the storage. |
|
| 53 | - * |
|
| 54 | - * @param string $tableName |
|
| 55 | - * @param string $id |
|
| 56 | - * @param DbRow $dbRow |
|
| 57 | - */ |
|
| 58 | - public function set($tableName, $id, DbRow $dbRow) |
|
| 59 | - { |
|
| 60 | - $this->objects[$tableName][$id] = new \WeakRef($dbRow); |
|
| 61 | - ++$this->garbageCollectorCount; |
|
| 62 | - if ($this->garbageCollectorCount == 10000) { |
|
| 63 | - $this->garbageCollectorCount = 0; |
|
| 64 | - $this->cleanupDanglingWeakRefs(); |
|
| 65 | - } |
|
| 66 | - } |
|
| 51 | + /** |
|
| 52 | + * Sets an object in the storage. |
|
| 53 | + * |
|
| 54 | + * @param string $tableName |
|
| 55 | + * @param string $id |
|
| 56 | + * @param DbRow $dbRow |
|
| 57 | + */ |
|
| 58 | + public function set($tableName, $id, DbRow $dbRow) |
|
| 59 | + { |
|
| 60 | + $this->objects[$tableName][$id] = new \WeakRef($dbRow); |
|
| 61 | + ++$this->garbageCollectorCount; |
|
| 62 | + if ($this->garbageCollectorCount == 10000) { |
|
| 63 | + $this->garbageCollectorCount = 0; |
|
| 64 | + $this->cleanupDanglingWeakRefs(); |
|
| 65 | + } |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * Checks if an object is in the storage. |
|
| 70 | - * |
|
| 71 | - * @param string $tableName |
|
| 72 | - * @param string $id |
|
| 73 | - * |
|
| 74 | - * @return bool |
|
| 75 | - */ |
|
| 76 | - public function has($tableName, $id) |
|
| 77 | - { |
|
| 78 | - if (isset($this->objects[$tableName][$id])) { |
|
| 79 | - if ($this->objects[$tableName][$id]->valid()) { |
|
| 80 | - return true; |
|
| 81 | - } else { |
|
| 82 | - unset($this->objects[$tableName][$id]); |
|
| 83 | - } |
|
| 84 | - } |
|
| 68 | + /** |
|
| 69 | + * Checks if an object is in the storage. |
|
| 70 | + * |
|
| 71 | + * @param string $tableName |
|
| 72 | + * @param string $id |
|
| 73 | + * |
|
| 74 | + * @return bool |
|
| 75 | + */ |
|
| 76 | + public function has($tableName, $id) |
|
| 77 | + { |
|
| 78 | + if (isset($this->objects[$tableName][$id])) { |
|
| 79 | + if ($this->objects[$tableName][$id]->valid()) { |
|
| 80 | + return true; |
|
| 81 | + } else { |
|
| 82 | + unset($this->objects[$tableName][$id]); |
|
| 83 | + } |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - return false; |
|
| 87 | - } |
|
| 86 | + return false; |
|
| 87 | + } |
|
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * Returns an object from the storage (or null if no object is set). |
|
| 91 | - * |
|
| 92 | - * @param string $tableName |
|
| 93 | - * @param string $id |
|
| 94 | - * |
|
| 95 | - * @return DbRow |
|
| 96 | - */ |
|
| 97 | - public function get($tableName, $id) |
|
| 98 | - { |
|
| 99 | - if (isset($this->objects[$tableName][$id])) { |
|
| 100 | - if ($this->objects[$tableName][$id]->valid()) { |
|
| 101 | - return $this->objects[$tableName][$id]->get(); |
|
| 102 | - } |
|
| 103 | - } else { |
|
| 104 | - return; |
|
| 105 | - } |
|
| 106 | - } |
|
| 89 | + /** |
|
| 90 | + * Returns an object from the storage (or null if no object is set). |
|
| 91 | + * |
|
| 92 | + * @param string $tableName |
|
| 93 | + * @param string $id |
|
| 94 | + * |
|
| 95 | + * @return DbRow |
|
| 96 | + */ |
|
| 97 | + public function get($tableName, $id) |
|
| 98 | + { |
|
| 99 | + if (isset($this->objects[$tableName][$id])) { |
|
| 100 | + if ($this->objects[$tableName][$id]->valid()) { |
|
| 101 | + return $this->objects[$tableName][$id]->get(); |
|
| 102 | + } |
|
| 103 | + } else { |
|
| 104 | + return; |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - /** |
|
| 109 | - * Removes an object from the storage. |
|
| 110 | - * |
|
| 111 | - * @param string $tableName |
|
| 112 | - * @param string $id |
|
| 113 | - */ |
|
| 114 | - public function remove($tableName, $id) |
|
| 115 | - { |
|
| 116 | - unset($this->objects[$tableName][$id]); |
|
| 117 | - } |
|
| 108 | + /** |
|
| 109 | + * Removes an object from the storage. |
|
| 110 | + * |
|
| 111 | + * @param string $tableName |
|
| 112 | + * @param string $id |
|
| 113 | + */ |
|
| 114 | + public function remove($tableName, $id) |
|
| 115 | + { |
|
| 116 | + unset($this->objects[$tableName][$id]); |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | - /** |
|
| 120 | - * Applies the callback to all objects. |
|
| 121 | - * |
|
| 122 | - * @param callable $callback |
|
| 123 | - */ |
|
| 124 | - public function apply(callable $callback) |
|
| 125 | - { |
|
| 126 | - foreach ($this->objects as $tableName => $table) { |
|
| 127 | - foreach ($table as $id => $obj) { |
|
| 128 | - if ($obj->valid()) { |
|
| 129 | - $callback($obj->get(), $tableName, $id); |
|
| 130 | - } else { |
|
| 131 | - unset($this->objects[$tableName][$id]); |
|
| 132 | - } |
|
| 133 | - } |
|
| 134 | - } |
|
| 135 | - } |
|
| 119 | + /** |
|
| 120 | + * Applies the callback to all objects. |
|
| 121 | + * |
|
| 122 | + * @param callable $callback |
|
| 123 | + */ |
|
| 124 | + public function apply(callable $callback) |
|
| 125 | + { |
|
| 126 | + foreach ($this->objects as $tableName => $table) { |
|
| 127 | + foreach ($table as $id => $obj) { |
|
| 128 | + if ($obj->valid()) { |
|
| 129 | + $callback($obj->get(), $tableName, $id); |
|
| 130 | + } else { |
|
| 131 | + unset($this->objects[$tableName][$id]); |
|
| 132 | + } |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | + } |
|
| 136 | 136 | |
| 137 | - private function cleanupDanglingWeakRefs() |
|
| 138 | - { |
|
| 139 | - foreach ($this->objects as $tableName => $table) { |
|
| 140 | - foreach ($table as $id => $obj) { |
|
| 141 | - if (!$obj->valid()) { |
|
| 142 | - unset($this->objects[$tableName][$id]); |
|
| 143 | - } |
|
| 144 | - } |
|
| 145 | - } |
|
| 146 | - } |
|
| 137 | + private function cleanupDanglingWeakRefs() |
|
| 138 | + { |
|
| 139 | + foreach ($this->objects as $tableName => $table) { |
|
| 140 | + foreach ($table as $id => $obj) { |
|
| 141 | + if (!$obj->valid()) { |
|
| 142 | + unset($this->objects[$tableName][$id]); |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | + } |
|
| 147 | 147 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | { |
| 66 | 66 | // First, are there many column or only one? |
| 67 | 67 | // If one column, we name the setter after it. Otherwise, we name the setter after the table name |
| 68 | - if (count($this->foreignKey->getLocalColumns()) > 1) { |
|
| 68 | + if (count($this->foreignKey->getLocalColumns())>1) { |
|
| 69 | 69 | $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName())); |
| 70 | 70 | if ($this->alternativeName) { |
| 71 | 71 | $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns()); |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | if (strpos(strtolower($column), 'id_') === 0) { |
| 79 | 79 | $column = substr($column, 3); |
| 80 | 80 | } |
| 81 | - if (strrpos(strtolower($column), '_id') === strlen($column) - 3) { |
|
| 82 | - $column = substr($column, 0, strlen($column) - 3); |
|
| 81 | + if (strrpos(strtolower($column), '_id') === strlen($column)-3) { |
|
| 82 | + $column = substr($column, 0, strlen($column)-3); |
|
| 83 | 83 | } |
| 84 | 84 | $name = TDBMDaoGenerator::toCamelCase($column); |
| 85 | 85 | if ($this->alternativeName) { |
@@ -12,156 +12,156 @@ discard block |
||
| 12 | 12 | */ |
| 13 | 13 | class ObjectBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * @var ForeignKeyConstraint |
|
| 17 | - */ |
|
| 18 | - private $foreignKey; |
|
| 19 | - |
|
| 20 | - /** |
|
| 21 | - * @var SchemaAnalyzer |
|
| 22 | - */ |
|
| 23 | - private $schemaAnalyzer; |
|
| 24 | - |
|
| 25 | - public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) |
|
| 26 | - { |
|
| 27 | - parent::__construct($table); |
|
| 28 | - $this->foreignKey = $foreignKey; |
|
| 29 | - $this->schemaAnalyzer = $schemaAnalyzer; |
|
| 30 | - } |
|
| 31 | - |
|
| 32 | - /** |
|
| 33 | - * Returns the foreignkey the column is part of, if any. null otherwise. |
|
| 34 | - * |
|
| 35 | - * @return ForeignKeyConstraint|null |
|
| 36 | - */ |
|
| 37 | - public function getForeignKey() |
|
| 38 | - { |
|
| 39 | - return $this->foreignKey; |
|
| 40 | - } |
|
| 41 | - |
|
| 42 | - /** |
|
| 43 | - * Returns the name of the class linked to this property or null if this is not a foreign key. |
|
| 44 | - * |
|
| 45 | - * @return null|string |
|
| 46 | - */ |
|
| 47 | - public function getClassName() |
|
| 48 | - { |
|
| 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 | - { |
|
| 59 | - $str = ' * @param %s %s'; |
|
| 60 | - |
|
| 61 | - return sprintf($str, $this->getClassName(), $this->getVariableName()); |
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - public function getUpperCamelCaseName() |
|
| 65 | - { |
|
| 66 | - // First, are there many column or only one? |
|
| 67 | - // If one column, we name the setter after it. Otherwise, we name the setter after the table name |
|
| 68 | - if (count($this->foreignKey->getLocalColumns()) > 1) { |
|
| 69 | - $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName())); |
|
| 70 | - if ($this->alternativeName) { |
|
| 71 | - $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns()); |
|
| 72 | - |
|
| 73 | - $name .= 'By'.implode('And', $camelizedColumns); |
|
| 74 | - } |
|
| 75 | - } else { |
|
| 76 | - $column = $this->foreignKey->getLocalColumns()[0]; |
|
| 77 | - // Let's remove any _id or id_. |
|
| 78 | - if (strpos(strtolower($column), 'id_') === 0) { |
|
| 79 | - $column = substr($column, 3); |
|
| 80 | - } |
|
| 81 | - if (strrpos(strtolower($column), '_id') === strlen($column) - 3) { |
|
| 82 | - $column = substr($column, 0, strlen($column) - 3); |
|
| 83 | - } |
|
| 84 | - $name = TDBMDaoGenerator::toCamelCase($column); |
|
| 85 | - if ($this->alternativeName) { |
|
| 86 | - $name .= 'Object'; |
|
| 87 | - } |
|
| 88 | - } |
|
| 89 | - |
|
| 90 | - return $name; |
|
| 91 | - } |
|
| 92 | - |
|
| 93 | - /** |
|
| 94 | - * Returns true if the property is compulsory (and therefore should be fetched in the constructor). |
|
| 95 | - * |
|
| 96 | - * @return bool |
|
| 97 | - */ |
|
| 98 | - public function isCompulsory() |
|
| 99 | - { |
|
| 100 | - // Are all columns nullable? |
|
| 101 | - $localColumnNames = $this->foreignKey->getLocalColumns(); |
|
| 102 | - |
|
| 103 | - foreach ($localColumnNames as $name) { |
|
| 104 | - $column = $this->table->getColumn($name); |
|
| 105 | - if ($column->getNotnull()) { |
|
| 106 | - return true; |
|
| 107 | - } |
|
| 108 | - } |
|
| 109 | - |
|
| 110 | - return false; |
|
| 111 | - } |
|
| 112 | - |
|
| 113 | - /** |
|
| 114 | - * Returns true if the property has a default value. |
|
| 115 | - * |
|
| 116 | - * @return bool |
|
| 117 | - */ |
|
| 118 | - public function hasDefault() |
|
| 119 | - { |
|
| 120 | - return false; |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - /** |
|
| 124 | - * Returns the code that assigns a value to its default value. |
|
| 125 | - * |
|
| 126 | - * @return string |
|
| 127 | - * |
|
| 128 | - * @throws \TDBMException |
|
| 129 | - */ |
|
| 130 | - public function assignToDefaultCode() |
|
| 131 | - { |
|
| 132 | - throw new \TDBMException('Foreign key based properties cannot be assigned a default value.'); |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - /** |
|
| 136 | - * Returns true if the property is the primary key. |
|
| 137 | - * |
|
| 138 | - * @return bool |
|
| 139 | - */ |
|
| 140 | - public function isPrimaryKey() |
|
| 141 | - { |
|
| 142 | - $fkColumns = $this->foreignKey->getLocalColumns(); |
|
| 143 | - sort($fkColumns); |
|
| 144 | - |
|
| 145 | - $pkColumns = $this->table->getPrimaryKeyColumns(); |
|
| 146 | - sort($pkColumns); |
|
| 147 | - |
|
| 148 | - return $fkColumns == $pkColumns; |
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - /** |
|
| 152 | - * Returns the PHP code for getters and setters. |
|
| 153 | - * |
|
| 154 | - * @return string |
|
| 155 | - */ |
|
| 156 | - public function getGetterSetterCode() |
|
| 157 | - { |
|
| 158 | - $tableName = $this->table->getName(); |
|
| 159 | - $getterName = $this->getGetterName(); |
|
| 160 | - $setterName = $this->getSetterName(); |
|
| 161 | - |
|
| 162 | - $referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName()); |
|
| 163 | - |
|
| 164 | - $str = ' /** |
|
| 15 | + /** |
|
| 16 | + * @var ForeignKeyConstraint |
|
| 17 | + */ |
|
| 18 | + private $foreignKey; |
|
| 19 | + |
|
| 20 | + /** |
|
| 21 | + * @var SchemaAnalyzer |
|
| 22 | + */ |
|
| 23 | + private $schemaAnalyzer; |
|
| 24 | + |
|
| 25 | + public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) |
|
| 26 | + { |
|
| 27 | + parent::__construct($table); |
|
| 28 | + $this->foreignKey = $foreignKey; |
|
| 29 | + $this->schemaAnalyzer = $schemaAnalyzer; |
|
| 30 | + } |
|
| 31 | + |
|
| 32 | + /** |
|
| 33 | + * Returns the foreignkey the column is part of, if any. null otherwise. |
|
| 34 | + * |
|
| 35 | + * @return ForeignKeyConstraint|null |
|
| 36 | + */ |
|
| 37 | + public function getForeignKey() |
|
| 38 | + { |
|
| 39 | + return $this->foreignKey; |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + /** |
|
| 43 | + * Returns the name of the class linked to this property or null if this is not a foreign key. |
|
| 44 | + * |
|
| 45 | + * @return null|string |
|
| 46 | + */ |
|
| 47 | + public function getClassName() |
|
| 48 | + { |
|
| 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 | + { |
|
| 59 | + $str = ' * @param %s %s'; |
|
| 60 | + |
|
| 61 | + return sprintf($str, $this->getClassName(), $this->getVariableName()); |
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + public function getUpperCamelCaseName() |
|
| 65 | + { |
|
| 66 | + // First, are there many column or only one? |
|
| 67 | + // If one column, we name the setter after it. Otherwise, we name the setter after the table name |
|
| 68 | + if (count($this->foreignKey->getLocalColumns()) > 1) { |
|
| 69 | + $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName())); |
|
| 70 | + if ($this->alternativeName) { |
|
| 71 | + $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns()); |
|
| 72 | + |
|
| 73 | + $name .= 'By'.implode('And', $camelizedColumns); |
|
| 74 | + } |
|
| 75 | + } else { |
|
| 76 | + $column = $this->foreignKey->getLocalColumns()[0]; |
|
| 77 | + // Let's remove any _id or id_. |
|
| 78 | + if (strpos(strtolower($column), 'id_') === 0) { |
|
| 79 | + $column = substr($column, 3); |
|
| 80 | + } |
|
| 81 | + if (strrpos(strtolower($column), '_id') === strlen($column) - 3) { |
|
| 82 | + $column = substr($column, 0, strlen($column) - 3); |
|
| 83 | + } |
|
| 84 | + $name = TDBMDaoGenerator::toCamelCase($column); |
|
| 85 | + if ($this->alternativeName) { |
|
| 86 | + $name .= 'Object'; |
|
| 87 | + } |
|
| 88 | + } |
|
| 89 | + |
|
| 90 | + return $name; |
|
| 91 | + } |
|
| 92 | + |
|
| 93 | + /** |
|
| 94 | + * Returns true if the property is compulsory (and therefore should be fetched in the constructor). |
|
| 95 | + * |
|
| 96 | + * @return bool |
|
| 97 | + */ |
|
| 98 | + public function isCompulsory() |
|
| 99 | + { |
|
| 100 | + // Are all columns nullable? |
|
| 101 | + $localColumnNames = $this->foreignKey->getLocalColumns(); |
|
| 102 | + |
|
| 103 | + foreach ($localColumnNames as $name) { |
|
| 104 | + $column = $this->table->getColumn($name); |
|
| 105 | + if ($column->getNotnull()) { |
|
| 106 | + return true; |
|
| 107 | + } |
|
| 108 | + } |
|
| 109 | + |
|
| 110 | + return false; |
|
| 111 | + } |
|
| 112 | + |
|
| 113 | + /** |
|
| 114 | + * Returns true if the property has a default value. |
|
| 115 | + * |
|
| 116 | + * @return bool |
|
| 117 | + */ |
|
| 118 | + public function hasDefault() |
|
| 119 | + { |
|
| 120 | + return false; |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + /** |
|
| 124 | + * Returns the code that assigns a value to its default value. |
|
| 125 | + * |
|
| 126 | + * @return string |
|
| 127 | + * |
|
| 128 | + * @throws \TDBMException |
|
| 129 | + */ |
|
| 130 | + public function assignToDefaultCode() |
|
| 131 | + { |
|
| 132 | + throw new \TDBMException('Foreign key based properties cannot be assigned a default value.'); |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + /** |
|
| 136 | + * Returns true if the property is the primary key. |
|
| 137 | + * |
|
| 138 | + * @return bool |
|
| 139 | + */ |
|
| 140 | + public function isPrimaryKey() |
|
| 141 | + { |
|
| 142 | + $fkColumns = $this->foreignKey->getLocalColumns(); |
|
| 143 | + sort($fkColumns); |
|
| 144 | + |
|
| 145 | + $pkColumns = $this->table->getPrimaryKeyColumns(); |
|
| 146 | + sort($pkColumns); |
|
| 147 | + |
|
| 148 | + return $fkColumns == $pkColumns; |
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + /** |
|
| 152 | + * Returns the PHP code for getters and setters. |
|
| 153 | + * |
|
| 154 | + * @return string |
|
| 155 | + */ |
|
| 156 | + public function getGetterSetterCode() |
|
| 157 | + { |
|
| 158 | + $tableName = $this->table->getName(); |
|
| 159 | + $getterName = $this->getGetterName(); |
|
| 160 | + $setterName = $this->getSetterName(); |
|
| 161 | + |
|
| 162 | + $referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName()); |
|
| 163 | + |
|
| 164 | + $str = ' /** |
|
| 165 | 165 | * Returns the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getLocalColumns()).' column. |
| 166 | 166 | * |
| 167 | 167 | * @return '.$referencedBeanName.' |
@@ -181,19 +181,19 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | '; |
| 183 | 183 | |
| 184 | - return $str; |
|
| 185 | - } |
|
| 186 | - |
|
| 187 | - /** |
|
| 188 | - * Returns the part of code useful when doing json serialization. |
|
| 189 | - * |
|
| 190 | - * @return string |
|
| 191 | - */ |
|
| 192 | - public function getJsonSerializeCode() |
|
| 193 | - { |
|
| 194 | - return ' if (!$stopRecursion) { |
|
| 184 | + return $str; |
|
| 185 | + } |
|
| 186 | + |
|
| 187 | + /** |
|
| 188 | + * Returns the part of code useful when doing json serialization. |
|
| 189 | + * |
|
| 190 | + * @return string |
|
| 191 | + */ |
|
| 192 | + public function getJsonSerializeCode() |
|
| 193 | + { |
|
| 194 | + return ' if (!$stopRecursion) { |
|
| 195 | 195 | $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName().'()->jsonSerialize(true); |
| 196 | 196 | } |
| 197 | 197 | '; |
| 198 | - } |
|
| 198 | + } |
|
| 199 | 199 | } |
@@ -27,100 +27,100 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | class InnerResultArray extends InnerResultIterator |
| 29 | 29 | { |
| 30 | - /** |
|
| 31 | - * The list of results already fetched. |
|
| 32 | - * |
|
| 33 | - * @var AbstractTDBMObject[] |
|
| 34 | - */ |
|
| 35 | - private $results = []; |
|
| 30 | + /** |
|
| 31 | + * The list of results already fetched. |
|
| 32 | + * |
|
| 33 | + * @var AbstractTDBMObject[] |
|
| 34 | + */ |
|
| 35 | + private $results = []; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Whether a offset exists. |
|
| 39 | - * |
|
| 40 | - * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
| 41 | - * |
|
| 42 | - * @param mixed $offset <p> |
|
| 43 | - * An offset to check for. |
|
| 44 | - * </p> |
|
| 45 | - * |
|
| 46 | - * @return bool true on success or false on failure. |
|
| 47 | - * </p> |
|
| 48 | - * <p> |
|
| 49 | - * The return value will be casted to boolean if non-boolean was returned. |
|
| 50 | - * |
|
| 51 | - * @since 5.0.0 |
|
| 52 | - */ |
|
| 53 | - public function offsetExists($offset) |
|
| 54 | - { |
|
| 55 | - try { |
|
| 56 | - $this->toIndex($offset); |
|
| 57 | - } catch (TDBMInvalidOffsetException $e) { |
|
| 58 | - return false; |
|
| 59 | - } |
|
| 37 | + /** |
|
| 38 | + * Whether a offset exists. |
|
| 39 | + * |
|
| 40 | + * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
| 41 | + * |
|
| 42 | + * @param mixed $offset <p> |
|
| 43 | + * An offset to check for. |
|
| 44 | + * </p> |
|
| 45 | + * |
|
| 46 | + * @return bool true on success or false on failure. |
|
| 47 | + * </p> |
|
| 48 | + * <p> |
|
| 49 | + * The return value will be casted to boolean if non-boolean was returned. |
|
| 50 | + * |
|
| 51 | + * @since 5.0.0 |
|
| 52 | + */ |
|
| 53 | + public function offsetExists($offset) |
|
| 54 | + { |
|
| 55 | + try { |
|
| 56 | + $this->toIndex($offset); |
|
| 57 | + } catch (TDBMInvalidOffsetException $e) { |
|
| 58 | + return false; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - return true; |
|
| 62 | - } |
|
| 61 | + return true; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Offset to retrieve. |
|
| 66 | - * |
|
| 67 | - * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
| 68 | - * |
|
| 69 | - * @param mixed $offset <p> |
|
| 70 | - * The offset to retrieve. |
|
| 71 | - * </p> |
|
| 72 | - * |
|
| 73 | - * @return mixed Can return all value types. |
|
| 74 | - * |
|
| 75 | - * @since 5.0.0 |
|
| 76 | - */ |
|
| 77 | - public function offsetGet($offset) |
|
| 78 | - { |
|
| 79 | - $this->toIndex($offset); |
|
| 64 | + /** |
|
| 65 | + * Offset to retrieve. |
|
| 66 | + * |
|
| 67 | + * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
| 68 | + * |
|
| 69 | + * @param mixed $offset <p> |
|
| 70 | + * The offset to retrieve. |
|
| 71 | + * </p> |
|
| 72 | + * |
|
| 73 | + * @return mixed Can return all value types. |
|
| 74 | + * |
|
| 75 | + * @since 5.0.0 |
|
| 76 | + */ |
|
| 77 | + public function offsetGet($offset) |
|
| 78 | + { |
|
| 79 | + $this->toIndex($offset); |
|
| 80 | 80 | |
| 81 | - return $this->results[$offset]; |
|
| 82 | - } |
|
| 81 | + return $this->results[$offset]; |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - private function toIndex($offset) |
|
| 85 | - { |
|
| 86 | - if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
| 87 | - throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.'); |
|
| 88 | - } |
|
| 89 | - if ($this->statement === null) { |
|
| 90 | - $this->executeQuery(); |
|
| 91 | - } |
|
| 92 | - while (!isset($this->results[$offset])) { |
|
| 93 | - $this->next(); |
|
| 94 | - if ($this->current === null) { |
|
| 95 | - throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.'); |
|
| 96 | - } |
|
| 97 | - } |
|
| 98 | - } |
|
| 84 | + private function toIndex($offset) |
|
| 85 | + { |
|
| 86 | + if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
| 87 | + throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.'); |
|
| 88 | + } |
|
| 89 | + if ($this->statement === null) { |
|
| 90 | + $this->executeQuery(); |
|
| 91 | + } |
|
| 92 | + while (!isset($this->results[$offset])) { |
|
| 93 | + $this->next(); |
|
| 94 | + if ($this->current === null) { |
|
| 95 | + throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.'); |
|
| 96 | + } |
|
| 97 | + } |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - public function next() |
|
| 101 | - { |
|
| 102 | - // Let's overload the next() method to store the result. |
|
| 103 | - if (isset($this->results[$this->key + 1])) { |
|
| 104 | - ++$this->key; |
|
| 105 | - $this->current = $this->results[$this->key]; |
|
| 106 | - } else { |
|
| 107 | - parent::next(); |
|
| 108 | - if ($this->current !== null) { |
|
| 109 | - $this->results[$this->key] = $this->current; |
|
| 110 | - } |
|
| 111 | - } |
|
| 112 | - } |
|
| 100 | + public function next() |
|
| 101 | + { |
|
| 102 | + // Let's overload the next() method to store the result. |
|
| 103 | + if (isset($this->results[$this->key + 1])) { |
|
| 104 | + ++$this->key; |
|
| 105 | + $this->current = $this->results[$this->key]; |
|
| 106 | + } else { |
|
| 107 | + parent::next(); |
|
| 108 | + if ($this->current !== null) { |
|
| 109 | + $this->results[$this->key] = $this->current; |
|
| 110 | + } |
|
| 111 | + } |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | - /** |
|
| 115 | - * Overloads the rewind implementation. |
|
| 116 | - * Do not reexecute the query. |
|
| 117 | - */ |
|
| 118 | - public function rewind() |
|
| 119 | - { |
|
| 120 | - if (!$this->fetchStarted) { |
|
| 121 | - $this->executeQuery(); |
|
| 122 | - } |
|
| 123 | - $this->key = -1; |
|
| 124 | - $this->next(); |
|
| 125 | - } |
|
| 114 | + /** |
|
| 115 | + * Overloads the rewind implementation. |
|
| 116 | + * Do not reexecute the query. |
|
| 117 | + */ |
|
| 118 | + public function rewind() |
|
| 119 | + { |
|
| 120 | + if (!$this->fetchStarted) { |
|
| 121 | + $this->executeQuery(); |
|
| 122 | + } |
|
| 123 | + $this->key = -1; |
|
| 124 | + $this->next(); |
|
| 125 | + } |
|
| 126 | 126 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | private function toIndex($offset) |
| 85 | 85 | { |
| 86 | - if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
| 86 | + if ($offset<0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
| 87 | 87 | throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.'); |
| 88 | 88 | } |
| 89 | 89 | if ($this->statement === null) { |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | public function next() |
| 101 | 101 | { |
| 102 | 102 | // Let's overload the next() method to store the result. |
| 103 | - if (isset($this->results[$this->key + 1])) { |
|
| 103 | + if (isset($this->results[$this->key+1])) { |
|
| 104 | 104 | ++$this->key; |
| 105 | 105 | $this->current = $this->results[$this->key]; |
| 106 | 106 | } else { |
@@ -27,10 +27,10 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | final class TDBMObjectStateEnum extends AbstractTDBMObject |
| 29 | 29 | { |
| 30 | - const STATE_DETACHED = 'detached'; |
|
| 31 | - const STATE_NEW = 'new'; |
|
| 32 | - const STATE_NOT_LOADED = 'not loaded'; |
|
| 33 | - const STATE_LOADED = 'loaded'; |
|
| 34 | - const STATE_DIRTY = 'dirty'; |
|
| 35 | - const STATE_DELETED = 'deleted'; |
|
| 30 | + const STATE_DETACHED = 'detached'; |
|
| 31 | + const STATE_NEW = 'new'; |
|
| 32 | + const STATE_NOT_LOADED = 'not loaded'; |
|
| 33 | + const STATE_LOADED = 'loaded'; |
|
| 34 | + const STATE_DIRTY = 'dirty'; |
|
| 35 | + const STATE_DELETED = 'deleted'; |
|
| 36 | 36 | } |
@@ -30,78 +30,78 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | class StandardObjectStorage |
| 32 | 32 | { |
| 33 | - /** |
|
| 34 | - * An array of fetched object, accessible via table name and primary key. |
|
| 35 | - * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
| 36 | - * |
|
| 37 | - * @var array<string, array<string, TDBMObject>> |
|
| 38 | - */ |
|
| 39 | - private $objects = array(); |
|
| 33 | + /** |
|
| 34 | + * An array of fetched object, accessible via table name and primary key. |
|
| 35 | + * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
| 36 | + * |
|
| 37 | + * @var array<string, array<string, TDBMObject>> |
|
| 38 | + */ |
|
| 39 | + private $objects = array(); |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Sets an object in the storage. |
|
| 43 | - * |
|
| 44 | - * @param string $tableName |
|
| 45 | - * @param string $id |
|
| 46 | - * @param TDBMObject $dbRow |
|
| 47 | - */ |
|
| 48 | - public function set($tableName, $id, DbRow $dbRow) |
|
| 49 | - { |
|
| 50 | - $this->objects[$tableName][$id] = $dbRow; |
|
| 51 | - } |
|
| 41 | + /** |
|
| 42 | + * Sets an object in the storage. |
|
| 43 | + * |
|
| 44 | + * @param string $tableName |
|
| 45 | + * @param string $id |
|
| 46 | + * @param TDBMObject $dbRow |
|
| 47 | + */ |
|
| 48 | + public function set($tableName, $id, DbRow $dbRow) |
|
| 49 | + { |
|
| 50 | + $this->objects[$tableName][$id] = $dbRow; |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * Checks if an object is in the storage. |
|
| 55 | - * |
|
| 56 | - * @param string $tableName |
|
| 57 | - * @param string $id |
|
| 58 | - * |
|
| 59 | - * @return bool |
|
| 60 | - */ |
|
| 61 | - public function has($tableName, $id) |
|
| 62 | - { |
|
| 63 | - return isset($this->objects[$tableName][$id]); |
|
| 64 | - } |
|
| 53 | + /** |
|
| 54 | + * Checks if an object is in the storage. |
|
| 55 | + * |
|
| 56 | + * @param string $tableName |
|
| 57 | + * @param string $id |
|
| 58 | + * |
|
| 59 | + * @return bool |
|
| 60 | + */ |
|
| 61 | + public function has($tableName, $id) |
|
| 62 | + { |
|
| 63 | + return isset($this->objects[$tableName][$id]); |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * Returns an object from the storage (or null if no object is set). |
|
| 68 | - * |
|
| 69 | - * @param string $tableName |
|
| 70 | - * @param string $id |
|
| 71 | - * |
|
| 72 | - * @return DbRow |
|
| 73 | - */ |
|
| 74 | - public function get($tableName, $id) |
|
| 75 | - { |
|
| 76 | - if (isset($this->objects[$tableName][$id])) { |
|
| 77 | - return $this->objects[$tableName][$id]; |
|
| 78 | - } else { |
|
| 79 | - return; |
|
| 80 | - } |
|
| 81 | - } |
|
| 66 | + /** |
|
| 67 | + * Returns an object from the storage (or null if no object is set). |
|
| 68 | + * |
|
| 69 | + * @param string $tableName |
|
| 70 | + * @param string $id |
|
| 71 | + * |
|
| 72 | + * @return DbRow |
|
| 73 | + */ |
|
| 74 | + public function get($tableName, $id) |
|
| 75 | + { |
|
| 76 | + if (isset($this->objects[$tableName][$id])) { |
|
| 77 | + return $this->objects[$tableName][$id]; |
|
| 78 | + } else { |
|
| 79 | + return; |
|
| 80 | + } |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * Removes an object from the storage. |
|
| 85 | - * |
|
| 86 | - * @param string $tableName |
|
| 87 | - * @param string $id |
|
| 88 | - */ |
|
| 89 | - public function remove($tableName, $id) |
|
| 90 | - { |
|
| 91 | - unset($this->objects[$tableName][$id]); |
|
| 92 | - } |
|
| 83 | + /** |
|
| 84 | + * Removes an object from the storage. |
|
| 85 | + * |
|
| 86 | + * @param string $tableName |
|
| 87 | + * @param string $id |
|
| 88 | + */ |
|
| 89 | + public function remove($tableName, $id) |
|
| 90 | + { |
|
| 91 | + unset($this->objects[$tableName][$id]); |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * Applies the callback to all objects. |
|
| 96 | - * |
|
| 97 | - * @param callable $callback |
|
| 98 | - */ |
|
| 99 | - public function apply(callable $callback) |
|
| 100 | - { |
|
| 101 | - foreach ($this->objects as $tableName => $table) { |
|
| 102 | - foreach ($table as $id => $obj) { |
|
| 103 | - $callback($obj, $tableName, $id); |
|
| 104 | - } |
|
| 105 | - } |
|
| 106 | - } |
|
| 94 | + /** |
|
| 95 | + * Applies the callback to all objects. |
|
| 96 | + * |
|
| 97 | + * @param callable $callback |
|
| 98 | + */ |
|
| 99 | + public function apply(callable $callback) |
|
| 100 | + { |
|
| 101 | + foreach ($this->objects as $tableName => $table) { |
|
| 102 | + foreach ($table as $id => $obj) { |
|
| 103 | + $callback($obj, $tableName, $id); |
|
| 104 | + } |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | 107 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | public function getCurrentPage() |
| 114 | 114 | { |
| 115 | - return floor($this->offset / $this->limit) + 1; |
|
| 115 | + return floor($this->offset/$this->limit)+1; |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | */ |
| 252 | 252 | public function jsonSerialize() |
| 253 | 253 | { |
| 254 | - return array_map(function (AbstractTDBMObject $item) { |
|
| 254 | + return array_map(function(AbstractTDBMObject $item) { |
|
| 255 | 255 | return $item->jsonSerialize(); |
| 256 | 256 | }, $this->toArray()); |
| 257 | 257 | } |
@@ -29,232 +29,232 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | class PageIterator implements Page, \ArrayAccess, \JsonSerializable |
| 31 | 31 | { |
| 32 | - /** |
|
| 33 | - * @var Statement |
|
| 34 | - */ |
|
| 35 | - protected $statement; |
|
| 32 | + /** |
|
| 33 | + * @var Statement |
|
| 34 | + */ |
|
| 35 | + protected $statement; |
|
| 36 | 36 | |
| 37 | - protected $fetchStarted = false; |
|
| 38 | - private $objectStorage; |
|
| 39 | - private $className; |
|
| 37 | + protected $fetchStarted = false; |
|
| 38 | + private $objectStorage; |
|
| 39 | + private $className; |
|
| 40 | 40 | |
| 41 | - private $parentResult; |
|
| 42 | - private $tdbmService; |
|
| 43 | - private $magicSql; |
|
| 44 | - private $parameters; |
|
| 45 | - private $limit; |
|
| 46 | - private $offset; |
|
| 47 | - private $columnDescriptors; |
|
| 48 | - private $magicQuery; |
|
| 41 | + private $parentResult; |
|
| 42 | + private $tdbmService; |
|
| 43 | + private $magicSql; |
|
| 44 | + private $parameters; |
|
| 45 | + private $limit; |
|
| 46 | + private $offset; |
|
| 47 | + private $columnDescriptors; |
|
| 48 | + private $magicQuery; |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * The key of the current retrieved object. |
|
| 52 | - * |
|
| 53 | - * @var int |
|
| 54 | - */ |
|
| 55 | - protected $key = -1; |
|
| 50 | + /** |
|
| 51 | + * The key of the current retrieved object. |
|
| 52 | + * |
|
| 53 | + * @var int |
|
| 54 | + */ |
|
| 55 | + protected $key = -1; |
|
| 56 | 56 | |
| 57 | - protected $current = null; |
|
| 57 | + protected $current = null; |
|
| 58 | 58 | |
| 59 | - private $databasePlatform; |
|
| 59 | + private $databasePlatform; |
|
| 60 | 60 | |
| 61 | - private $innerResultIterator; |
|
| 61 | + private $innerResultIterator; |
|
| 62 | 62 | |
| 63 | - private $mode; |
|
| 63 | + private $mode; |
|
| 64 | 64 | |
| 65 | - public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode) |
|
| 66 | - { |
|
| 67 | - $this->parentResult = $parentResult; |
|
| 68 | - $this->magicSql = $magicSql; |
|
| 69 | - $this->objectStorage = $objectStorage; |
|
| 70 | - $this->className = $className; |
|
| 71 | - $this->tdbmService = $tdbmService; |
|
| 72 | - $this->parameters = $parameters; |
|
| 73 | - $this->limit = $limit; |
|
| 74 | - $this->offset = $offset; |
|
| 75 | - $this->columnDescriptors = $columnDescriptors; |
|
| 76 | - $this->magicQuery = $magicQuery; |
|
| 77 | - $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform(); |
|
| 78 | - $this->mode = $mode; |
|
| 79 | - } |
|
| 65 | + public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode) |
|
| 66 | + { |
|
| 67 | + $this->parentResult = $parentResult; |
|
| 68 | + $this->magicSql = $magicSql; |
|
| 69 | + $this->objectStorage = $objectStorage; |
|
| 70 | + $this->className = $className; |
|
| 71 | + $this->tdbmService = $tdbmService; |
|
| 72 | + $this->parameters = $parameters; |
|
| 73 | + $this->limit = $limit; |
|
| 74 | + $this->offset = $offset; |
|
| 75 | + $this->columnDescriptors = $columnDescriptors; |
|
| 76 | + $this->magicQuery = $magicQuery; |
|
| 77 | + $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform(); |
|
| 78 | + $this->mode = $mode; |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * Retrieve an external iterator. |
|
| 83 | - * |
|
| 84 | - * @link http://php.net/manual/en/iteratoraggregate.getiterator.php |
|
| 85 | - * |
|
| 86 | - * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or |
|
| 87 | - * <b>Traversable</b> |
|
| 88 | - * |
|
| 89 | - * @since 5.0.0 |
|
| 90 | - */ |
|
| 91 | - public function getIterator() |
|
| 92 | - { |
|
| 93 | - if ($this->innerResultIterator === null) { |
|
| 94 | - if ($this->mode === TDBMService::MODE_CURSOR) { |
|
| 95 | - $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
| 96 | - } else { |
|
| 97 | - $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
| 98 | - } |
|
| 99 | - } |
|
| 81 | + /** |
|
| 82 | + * Retrieve an external iterator. |
|
| 83 | + * |
|
| 84 | + * @link http://php.net/manual/en/iteratoraggregate.getiterator.php |
|
| 85 | + * |
|
| 86 | + * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or |
|
| 87 | + * <b>Traversable</b> |
|
| 88 | + * |
|
| 89 | + * @since 5.0.0 |
|
| 90 | + */ |
|
| 91 | + public function getIterator() |
|
| 92 | + { |
|
| 93 | + if ($this->innerResultIterator === null) { |
|
| 94 | + if ($this->mode === TDBMService::MODE_CURSOR) { |
|
| 95 | + $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
| 96 | + } else { |
|
| 97 | + $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - return $this->innerResultIterator; |
|
| 102 | - } |
|
| 101 | + return $this->innerResultIterator; |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - /** |
|
| 105 | - * @return int |
|
| 106 | - */ |
|
| 107 | - public function getCurrentOffset() |
|
| 108 | - { |
|
| 109 | - return $this->offset; |
|
| 110 | - } |
|
| 104 | + /** |
|
| 105 | + * @return int |
|
| 106 | + */ |
|
| 107 | + public function getCurrentOffset() |
|
| 108 | + { |
|
| 109 | + return $this->offset; |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - /** |
|
| 113 | - * @return int |
|
| 114 | - */ |
|
| 115 | - public function getCurrentPage() |
|
| 116 | - { |
|
| 117 | - return floor($this->offset / $this->limit) + 1; |
|
| 118 | - } |
|
| 112 | + /** |
|
| 113 | + * @return int |
|
| 114 | + */ |
|
| 115 | + public function getCurrentPage() |
|
| 116 | + { |
|
| 117 | + return floor($this->offset / $this->limit) + 1; |
|
| 118 | + } |
|
| 119 | 119 | |
| 120 | - /** |
|
| 121 | - * @return int |
|
| 122 | - */ |
|
| 123 | - public function getCurrentLimit() |
|
| 124 | - { |
|
| 125 | - return $this->limit; |
|
| 126 | - } |
|
| 120 | + /** |
|
| 121 | + * @return int |
|
| 122 | + */ |
|
| 123 | + public function getCurrentLimit() |
|
| 124 | + { |
|
| 125 | + return $this->limit; |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - /** |
|
| 129 | - * Return the number of results on the current page of the {@link Result}. |
|
| 130 | - * |
|
| 131 | - * @return int |
|
| 132 | - */ |
|
| 133 | - public function count() |
|
| 134 | - { |
|
| 135 | - return $this->getIterator()->count(); |
|
| 136 | - } |
|
| 128 | + /** |
|
| 129 | + * Return the number of results on the current page of the {@link Result}. |
|
| 130 | + * |
|
| 131 | + * @return int |
|
| 132 | + */ |
|
| 133 | + public function count() |
|
| 134 | + { |
|
| 135 | + return $this->getIterator()->count(); |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | - /** |
|
| 139 | - * Return the number of ALL results in the paginatable of {@link Result}. |
|
| 140 | - * |
|
| 141 | - * @return int |
|
| 142 | - */ |
|
| 143 | - public function totalCount() |
|
| 144 | - { |
|
| 145 | - return $this->parentResult->count(); |
|
| 146 | - } |
|
| 138 | + /** |
|
| 139 | + * Return the number of ALL results in the paginatable of {@link Result}. |
|
| 140 | + * |
|
| 141 | + * @return int |
|
| 142 | + */ |
|
| 143 | + public function totalCount() |
|
| 144 | + { |
|
| 145 | + return $this->parentResult->count(); |
|
| 146 | + } |
|
| 147 | 147 | |
| 148 | - /** |
|
| 149 | - * Casts the result set to a PHP array. |
|
| 150 | - * |
|
| 151 | - * @return array |
|
| 152 | - */ |
|
| 153 | - public function toArray() |
|
| 154 | - { |
|
| 155 | - return iterator_to_array($this->getIterator()); |
|
| 156 | - } |
|
| 148 | + /** |
|
| 149 | + * Casts the result set to a PHP array. |
|
| 150 | + * |
|
| 151 | + * @return array |
|
| 152 | + */ |
|
| 153 | + public function toArray() |
|
| 154 | + { |
|
| 155 | + return iterator_to_array($this->getIterator()); |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | - /** |
|
| 159 | - * Returns a new iterator mapping any call using the $callable function. |
|
| 160 | - * |
|
| 161 | - * @param callable $callable |
|
| 162 | - * |
|
| 163 | - * @return MapIterator |
|
| 164 | - */ |
|
| 165 | - public function map(callable $callable) |
|
| 166 | - { |
|
| 167 | - return new MapIterator($this->getIterator(), $callable); |
|
| 168 | - } |
|
| 158 | + /** |
|
| 159 | + * Returns a new iterator mapping any call using the $callable function. |
|
| 160 | + * |
|
| 161 | + * @param callable $callable |
|
| 162 | + * |
|
| 163 | + * @return MapIterator |
|
| 164 | + */ |
|
| 165 | + public function map(callable $callable) |
|
| 166 | + { |
|
| 167 | + return new MapIterator($this->getIterator(), $callable); |
|
| 168 | + } |
|
| 169 | 169 | |
| 170 | - /** |
|
| 171 | - * Whether a offset exists. |
|
| 172 | - * |
|
| 173 | - * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
| 174 | - * |
|
| 175 | - * @param mixed $offset <p> |
|
| 176 | - * An offset to check for. |
|
| 177 | - * </p> |
|
| 178 | - * |
|
| 179 | - * @return bool true on success or false on failure. |
|
| 180 | - * </p> |
|
| 181 | - * <p> |
|
| 182 | - * The return value will be casted to boolean if non-boolean was returned. |
|
| 183 | - * |
|
| 184 | - * @since 5.0.0 |
|
| 185 | - */ |
|
| 186 | - public function offsetExists($offset) |
|
| 187 | - { |
|
| 188 | - return $this->getIterator()->offsetExists($offset); |
|
| 189 | - } |
|
| 170 | + /** |
|
| 171 | + * Whether a offset exists. |
|
| 172 | + * |
|
| 173 | + * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
| 174 | + * |
|
| 175 | + * @param mixed $offset <p> |
|
| 176 | + * An offset to check for. |
|
| 177 | + * </p> |
|
| 178 | + * |
|
| 179 | + * @return bool true on success or false on failure. |
|
| 180 | + * </p> |
|
| 181 | + * <p> |
|
| 182 | + * The return value will be casted to boolean if non-boolean was returned. |
|
| 183 | + * |
|
| 184 | + * @since 5.0.0 |
|
| 185 | + */ |
|
| 186 | + public function offsetExists($offset) |
|
| 187 | + { |
|
| 188 | + return $this->getIterator()->offsetExists($offset); |
|
| 189 | + } |
|
| 190 | 190 | |
| 191 | - /** |
|
| 192 | - * Offset to retrieve. |
|
| 193 | - * |
|
| 194 | - * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
| 195 | - * |
|
| 196 | - * @param mixed $offset <p> |
|
| 197 | - * The offset to retrieve. |
|
| 198 | - * </p> |
|
| 199 | - * |
|
| 200 | - * @return mixed Can return all value types. |
|
| 201 | - * |
|
| 202 | - * @since 5.0.0 |
|
| 203 | - */ |
|
| 204 | - public function offsetGet($offset) |
|
| 205 | - { |
|
| 206 | - return $this->getIterator()->offsetGet($offset); |
|
| 207 | - } |
|
| 191 | + /** |
|
| 192 | + * Offset to retrieve. |
|
| 193 | + * |
|
| 194 | + * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
| 195 | + * |
|
| 196 | + * @param mixed $offset <p> |
|
| 197 | + * The offset to retrieve. |
|
| 198 | + * </p> |
|
| 199 | + * |
|
| 200 | + * @return mixed Can return all value types. |
|
| 201 | + * |
|
| 202 | + * @since 5.0.0 |
|
| 203 | + */ |
|
| 204 | + public function offsetGet($offset) |
|
| 205 | + { |
|
| 206 | + return $this->getIterator()->offsetGet($offset); |
|
| 207 | + } |
|
| 208 | 208 | |
| 209 | - /** |
|
| 210 | - * Offset to set. |
|
| 211 | - * |
|
| 212 | - * @link http://php.net/manual/en/arrayaccess.offsetset.php |
|
| 213 | - * |
|
| 214 | - * @param mixed $offset <p> |
|
| 215 | - * The offset to assign the value to. |
|
| 216 | - * </p> |
|
| 217 | - * @param mixed $value <p> |
|
| 218 | - * The value to set. |
|
| 219 | - * </p> |
|
| 220 | - * |
|
| 221 | - * @since 5.0.0 |
|
| 222 | - */ |
|
| 223 | - public function offsetSet($offset, $value) |
|
| 224 | - { |
|
| 225 | - return $this->getIterator()->offsetSet($offset, $value); |
|
| 226 | - } |
|
| 209 | + /** |
|
| 210 | + * Offset to set. |
|
| 211 | + * |
|
| 212 | + * @link http://php.net/manual/en/arrayaccess.offsetset.php |
|
| 213 | + * |
|
| 214 | + * @param mixed $offset <p> |
|
| 215 | + * The offset to assign the value to. |
|
| 216 | + * </p> |
|
| 217 | + * @param mixed $value <p> |
|
| 218 | + * The value to set. |
|
| 219 | + * </p> |
|
| 220 | + * |
|
| 221 | + * @since 5.0.0 |
|
| 222 | + */ |
|
| 223 | + public function offsetSet($offset, $value) |
|
| 224 | + { |
|
| 225 | + return $this->getIterator()->offsetSet($offset, $value); |
|
| 226 | + } |
|
| 227 | 227 | |
| 228 | - /** |
|
| 229 | - * Offset to unset. |
|
| 230 | - * |
|
| 231 | - * @link http://php.net/manual/en/arrayaccess.offsetunset.php |
|
| 232 | - * |
|
| 233 | - * @param mixed $offset <p> |
|
| 234 | - * The offset to unset. |
|
| 235 | - * </p> |
|
| 236 | - * |
|
| 237 | - * @since 5.0.0 |
|
| 238 | - */ |
|
| 239 | - public function offsetUnset($offset) |
|
| 240 | - { |
|
| 241 | - return $this->getIterator()->offsetUnset($offset); |
|
| 242 | - } |
|
| 228 | + /** |
|
| 229 | + * Offset to unset. |
|
| 230 | + * |
|
| 231 | + * @link http://php.net/manual/en/arrayaccess.offsetunset.php |
|
| 232 | + * |
|
| 233 | + * @param mixed $offset <p> |
|
| 234 | + * The offset to unset. |
|
| 235 | + * </p> |
|
| 236 | + * |
|
| 237 | + * @since 5.0.0 |
|
| 238 | + */ |
|
| 239 | + public function offsetUnset($offset) |
|
| 240 | + { |
|
| 241 | + return $this->getIterator()->offsetUnset($offset); |
|
| 242 | + } |
|
| 243 | 243 | |
| 244 | - /** |
|
| 245 | - * Specify data which should be serialized to JSON. |
|
| 246 | - * |
|
| 247 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 248 | - * |
|
| 249 | - * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 250 | - * which is a value of any type other than a resource. |
|
| 251 | - * |
|
| 252 | - * @since 5.4.0 |
|
| 253 | - */ |
|
| 254 | - public function jsonSerialize() |
|
| 255 | - { |
|
| 256 | - return array_map(function (AbstractTDBMObject $item) { |
|
| 257 | - return $item->jsonSerialize(); |
|
| 258 | - }, $this->toArray()); |
|
| 259 | - } |
|
| 244 | + /** |
|
| 245 | + * Specify data which should be serialized to JSON. |
|
| 246 | + * |
|
| 247 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 248 | + * |
|
| 249 | + * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 250 | + * which is a value of any type other than a resource. |
|
| 251 | + * |
|
| 252 | + * @since 5.4.0 |
|
| 253 | + */ |
|
| 254 | + public function jsonSerialize() |
|
| 255 | + { |
|
| 256 | + return array_map(function (AbstractTDBMObject $item) { |
|
| 257 | + return $item->jsonSerialize(); |
|
| 258 | + }, $this->toArray()); |
|
| 259 | + } |
|
| 260 | 260 | } |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | <input type="hidden" id="selfedit" name="selfedit" value="<?php echo plainstring_to_htmlprotected($this->selfedit) ?>" /> |
| 9 | 9 | |
| 10 | 10 | <?php if (!$this->autoloadDetected) { |
| 11 | - ?> |
|
| 11 | + ?> |
|
| 12 | 12 | <div class="alert">Warning! TDBM could not detect the autoload section of your composer.json file. |
| 13 | 13 | Unless you are developing your own autoload system, you should configure <strong>composer.json</strong> to <a href="http://getcomposer.org/doc/01-basic-usage.md#autoloading" target="_blank">define a source directory and a root namespace using PSR-0</a>.</div> |
| 14 | 14 | <?php |