Completed
Pull Request — develop (#1)
by Oyebanji Jacob
02:10
created
src/Model.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@
 block discarded – undo
203 203
     /**
204 204
      * Save the model data to the database.
205 205
      *
206
-     * @return bool
206
+     * @return integer
207 207
      */
208 208
     public function save()
209 209
     {
Please login to merge, or discard this patch.
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -17,22 +17,22 @@  discard block
 block discarded – undo
17 17
      */
18 18
     protected $databaseConnection;
19 19
 
20
-     /**
21
-      *  The id of the model.
22
-      *
23
-      * @property string $id
24
-      */
25
-
26
-     /**
27
-      * Create a model instance.
28
-      */
29
-     public function __construct(DatabaseConnectionInterface $databaseConnection = null)
30
-     {
31
-         if ($databaseConnection == null) {
32
-             $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;
33
-         }
34
-         $this->databaseConnection = $databaseConnection;
35
-     }
20
+        /**
21
+         *  The id of the model.
22
+         *
23
+         * @property string $id
24
+         */
25
+
26
+        /**
27
+         * Create a model instance.
28
+         */
29
+        public function __construct(DatabaseConnectionInterface $databaseConnection = null)
30
+        {
31
+            if ($databaseConnection == null) {
32
+                $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;
33
+            }
34
+            $this->databaseConnection = $databaseConnection;
35
+        }
36 36
 
37 37
     /**
38 38
      * Sets into $properties the $key => $value pairs.
@@ -55,23 +55,23 @@  discard block
 block discarded – undo
55 55
         return $this->properties[$key];
56 56
     }
57 57
 
58
-     /**
59
-      * Get all the model properties.
60
-      *
61
-      * @return array
62
-      */
63
-     public function getProperties()
64
-     {
65
-         return $this->properties;
66
-     }
67
-
68
-     /**
69
-      * Set model properties.
70
-      */
71
-     public function setProperties(array $properties)
72
-     {
73
-         $this->properties = $properties;
74
-     }
58
+        /**
59
+         * Get all the model properties.
60
+         *
61
+         * @return array
62
+         */
63
+        public function getProperties()
64
+        {
65
+            return $this->properties;
66
+        }
67
+
68
+        /**
69
+         * Set model properties.
70
+         */
71
+        public function setProperties(array $properties)
72
+        {
73
+            $this->properties = $properties;
74
+        }
75 75
 
76 76
     /**
77 77
      * Gets the name of the child class with a 's'.
Please login to merge, or discard this patch.
test/DatabaseConnectionTest.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
      * Reference: https://jtreminio.com/2013/03/unit-testing-tutorial-part-3-testing-protected-private-methods-coverage-reports-and-crap/
70 70
      * Call protected/private method of a class.
71 71
      *
72
-     * @param object &$object    Instantiated object that we will run method on.
72
+     * @param object DatabaseConnection    Instantiated object that we will run method on.
73 73
      * @param string $methodName Method name to call
74 74
      * @param array  $parameters Array of parameters to pass into method.
75 75
      *
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
         $databaseConnectionStringFactory =
16 16
                         m::mock('Pyjac\ORM\DatabaseConnectionStringFactoryInterface');
17 17
         $databaseConnectionStringFactory->shouldReceive('createDatabaseSourceString')
18
-                                             ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
18
+                                                ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
19 19
 
20 20
         $this->databaseConnection = new DatabaseConnection($databaseConnectionStringFactory);
21 21
     }
Please login to merge, or discard this patch.
test/ModelTest.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
                         m::mock('Pyjac\ORM\DatabaseConnectionStringFactoryInterface');
22 22
 
23 23
         $databaseConnectionStringFactory->shouldReceive('createDatabaseSourceString')
24
-                                             ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
24
+                                                ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
25 25
 
26 26
         $this->databaseConnection = m::mock('Pyjac\ORM\DatabaseConnection');
27 27
 
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
     {
37 37
         $this->databaseConnection->shouldReceive('createConnection')->with('sqlite::memory:')->once()->andReturn('');
38 38
         $this->model->expects($this->any())
39
-             ->method('getTableName')
40
-             ->will($this->returnValue(strtolower(get_class($this->model).'s')));
39
+                ->method('getTableName')
40
+                ->will($this->returnValue(strtolower(get_class($this->model).'s')));
41 41
 
42 42
         $this->assertEquals($this->model->getTableName(), strtolower(get_class($this->model).'s'));
43 43
     }
Please login to merge, or discard this patch.