Completed
Pull Request — 4.0 (#84)
by Jean-Baptiste
05:47
created
src/Mouf/Database/TDBM/ResultIterator.php 2 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -66,6 +66,13 @@  discard block
 block discarded – undo
66 66
 
67 67
     private $mode;
68 68
 
69
+    /**
70
+     * @param string $magicSql
71
+     * @param string $magicSqlCount
72
+     * @param WeakrefObjectStorage $objectStorage
73
+     * @param string|null $className
74
+     * @param integer $mode
75
+     */
69 76
     public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
70 77
     {
71 78
         $this->magicSql = $magicSql;
@@ -147,6 +154,7 @@  discard block
 block discarded – undo
147 154
 
148 155
     /**
149 156
      * @param int $offset
157
+     * @param integer $limit
150 158
      *
151 159
      * @return PageIterator
152 160
      */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -245,7 +245,7 @@
 block discarded – undo
245 245
      */
246 246
     public function jsonSerialize($stopRecursion = false)
247 247
     {
248
-        return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
248
+        return array_map(function(AbstractTDBMObject $item) use ($stopRecursion) {
249 249
             return $item->jsonSerialize($stopRecursion);
250 250
         }, $this->toArray());
251 251
     }
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/TDBMSchemaAnalyzer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@
 block discarded – undo
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 = [];
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Utils/ObjectBeanPropertyDescriptor.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/InnerResultArray.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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 {
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/PageIterator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -181,6 +181,9 @@
 block discarded – undo
181 181
 
182 182
     protected $errorMsg;
183 183
 
184
+    /**
185
+     * @param string $msg
186
+     */
184 187
     private function displayErrorMsg($msg)
185 188
     {
186 189
         $this->errorMsg = $msg;
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Utils/TDBMDaoGenerator.php 2 patches
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     /**
148 148
      * Returns the name of the base bean class from the table name.
149 149
      *
150
-     * @param $tableName
150
+     * @param string $tableName
151 151
      *
152 152
      * @return string
153 153
      */
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
     /**
160 160
      * Returns the name of the base DAO class from the table name.
161 161
      *
162
-     * @param $tableName
162
+     * @param string $tableName
163 163
      *
164 164
      * @return string
165 165
      */
@@ -176,6 +176,7 @@  discard block
 block discarded – undo
176 176
      * @param Table           $table           The table
177 177
      * @param string          $beannamespace   The namespace of the bean
178 178
      * @param ClassNameMapper $classNameMapper
179
+     * @param boolean $storeInUtc
179 180
      *
180 181
      * @throws TDBMException
181 182
      */
@@ -486,6 +487,8 @@  discard block
 block discarded – undo
486 487
      * Generates the factory bean.
487 488
      *
488 489
      * @param Table[] $tableList
490
+     * @param string $daoFactoryClassName
491
+     * @param string $daoNamespace
489 492
      */
490 493
     private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper)
491 494
     {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -77,11 +77,11 @@  discard block
 block discarded – undo
77 77
 
78 78
         // Remove all beans and daos from junction tables
79 79
         $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
80
-        $junctionTableNames = array_map(function (Table $table) {
80
+        $junctionTableNames = array_map(function(Table $table) {
81 81
             return $table->getName();
82 82
         }, $junctionTables);
83 83
 
84
-        $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
84
+        $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) {
85 85
             return !in_array($table->getName(), $junctionTableNames);
86 86
         });
87 87
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         // Ok, let's return the list of all tables.
95 95
         // These will be used by the calling script to create Mouf instances.
96 96
 
97
-        return array_map(function (Table $table) { return $table->getName(); }, $tableList);
97
+        return array_map(function(Table $table) { return $table->getName(); }, $tableList);
98 98
     }
99 99
 
100 100
     /**
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
         $usedBeans[] = $beanClassName;
288 288
         // Let's suppress duplicates in used beans (if any)
289 289
         $usedBeans = array_flip(array_flip($usedBeans));
290
-        $useStatements = array_map(function ($usedBean) {
290
+        $useStatements = array_map(function($usedBean) {
291 291
             return "use $usedBean;\n";
292 292
         }, $usedBeans);
293 293
 
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
                 $pos = strpos($str, ' ');
588 588
             }
589 589
             $before = substr($str, 0, $pos);
590
-            $after = substr($str, $pos + 1);
590
+            $after = substr($str, $pos+1);
591 591
             $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
592 592
         }
593 593
 
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/AbstractTDBMObject.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
      */
187 187
     private function checkTableName($tableName = null) {
188 188
         if ($tableName === null) {
189
-            if (count($this->dbRows) > 1) {
189
+            if (count($this->dbRows)>1) {
190 190
                 throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
191 191
             } elseif (count($this->dbRows) === 1) {
192 192
                 $tableName = array_keys($this->dbRows)[0];
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
     protected function set($var, $value, $tableName = null)
214 214
     {
215 215
         if ($tableName === null) {
216
-            if (count($this->dbRows) > 1) {
216
+            if (count($this->dbRows)>1) {
217 217
                 throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
218 218
             } elseif (count($this->dbRows) === 1) {
219 219
                 $tableName = array_keys($this->dbRows)[0];
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
     protected function setRef($foreignKeyName, AbstractTDBMObject $bean, $tableName = null)
240 240
     {
241 241
         if ($tableName === null) {
242
-            if (count($this->dbRows) > 1) {
242
+            if (count($this->dbRows)>1) {
243 243
                 throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
244 244
             } elseif (count($this->dbRows) === 1) {
245 245
                 $tableName = array_keys($this->dbRows)[0];
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmController.php 1 patch
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
      * @Action
87 87
      *
88 88
      * @param string $name
89
-     * @param bool   $selfedit
89
+     * @param string|boolean   $selfedit
90 90
      */
91 91
     public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
92 92
     {
@@ -109,6 +109,8 @@  discard block
 block discarded – undo
109 109
      * @param string      $daofactoryinstancename
110 110
      * @param string      $selfedit
111 111
      * @param bool        $storeInUtc
112
+     * @param boolean $useCustomComposer
113
+     * @param string $composerFile
112 114
      *
113 115
      * @throws \Mouf\MoufException
114 116
      */
Please login to merge, or discard this patch.