rebase master

config.php

@@ -13,10 +13,10 @@
         'driver' => 'pdo_pgsql',
     ],
     'migrations' => [
-        'path' => dirname(__FILE__).'/application/Migrations',
+        'path' => dirname(__FILE__) . '/application/Migrations',
     ],
     'models' => [
-        'path' => dirname(__FILE__).'/application/Models',
+        'path' => dirname(__FILE__) . '/application/Models',
         'namespace' => 'App\Models',
         'autoload' => true,
     ],

docs/source/changelog.rst

@@ -89,7 +89,7 @@ Additions
 
 Improvements and Fixes
 -----------------------
-    
+
     - Provides a consistent api for the models meta data, for easier access.
     - A consistent approach to how checks are carried out.
     - Migrations operations
@@ -98,7 +98,7 @@ Improvements and Fixes
 
 Rewrites
 -----------------------
-    
+
     - The whole migration module.
 
         - This module saw the addition of some important class:

docs/source/form/form.rst

@@ -5,24 +5,24 @@ Working with forms
     :local:
     :depth: 2
 
-Handling forms is a complex business. where numerous items of data of several different types may need to be:
+    Handling forms is a complex business. where numerous items of data of several different types may need to be:
 
-- prepared for display in a form,
-- rendered as HTML,
-- edited using a convenient interface,
-- returned to the server,
-- validated and cleaned up, and then saved or passed on for further processing.
+    - prepared for display in a form,
+    - rendered as HTML,
+    - edited using a convenient interface,
+    - returned to the server,
+    - validated and cleaned up, and then saved or passed on for further processing.
 
-Powerform functionality can simplify and automate vast portions of this work, and can also do it more securely
-than most programmers would be able to do in code they wrote themselves.
+    Powerform functionality can simplify and automate vast portions of this work, and can also do it more securely
+    than most programmers would be able to do in code they wrote themselves.
 
-Powerform handles three distinct parts of the work involved in forms:
+    Powerform handles three distinct parts of the work involved in forms:
 
-- preparing and restructuring data to make it ready for rendering.
-- creating HTML forms for the data
-- receiving and processing submitted forms and data from the client.
+    - preparing and restructuring data to make it ready for rendering.
+    - creating HTML forms for the data
+    - receiving and processing submitted forms and data from the client.
 
-It is possible to write code that does all of this manually, but Powerform can take care of it all for you.
+    It is possible to write code that does all of this manually, but Powerform can take care of it all for you.
 
 
 Building a form

docs/source/form/index.rst

@@ -27,13 +27,13 @@ Then, require the vendor/autoload.php file to enable the autoloading mechanism p
 application won't be able to find the classes of Powerform.
 
 .. toctree::
-   :maxdepth: 2
-
-   form
-   form_api
-   fields
-   widgets
-   modelform
-   validations
-   validators
-   example
+:maxdepth: 2
+
+       form
+       form_api
+       fields
+       widgets
+       modelform
+       validations
+       validators
+       example

docs/source/form/validations.rst

@@ -5,9 +5,9 @@ Form and field validation
     :local:
     :depth: 2
 
-Form validation happens when the data is cleaned. If you want to customize this process, there are various places to
-make changes, each one serving a different purpose. Three types of cleaning methods are run during form processing.
-These are normally executed when you call the **isValid()** method on a form.
+    Form validation happens when the data is cleaned. If you want to customize this process, there are various places to
+    make changes, each one serving a different purpose. Three types of cleaning methods are run during form processing.
+    These are normally executed when you call the **isValid()** method on a form.
 There are other things that can also trigger cleaning and validation (accessing the **errors()** method or
 calling **fullClean()** directly), but normally they won't be needed.
 

docs/source/index.rst

@@ -49,18 +49,18 @@ Extra Information
 *****************
 
 .. toctree::
-    :titlesonly:
-    :maxdepth: 1
+:titlesonly:
+        :maxdepth: 1
 
-    orm/index
-    form/index
-    debugger/index
-    faker/index
-    phpgis/index
-    license
-    changelog
+        orm/index
+        form/index
+        debugger/index
+        faker/index
+        phpgis/index
+        license
+        changelog
 
 
-- :doc:`License Agreement <license>`
+    - :doc:`License Agreement <license>`
 - :doc:`Change Log <changelog>`
 

docs/source/orm/index.rst

@@ -9,56 +9,56 @@ Overview
 **************
 
 .. toctree::
-   :titlesonly:
+:titlesonly:
 
-   intro/index
+       intro/index
 
 
 **************
 Model
 **************
 
 .. toctree::
-    :titlesonly:
+:titlesonly:
 
-    model/index
+        model/index
 
 **************
 Queries
 **************
 
 .. toctree::
-    :titlesonly:
+:titlesonly:
 
-    queries/index
+        queries/index
 
 
 **************
 Migration
 **************
 
 .. toctree::
-    :titlesonly:
+:titlesonly:
 
-    migration/index
+        migration/index
 
 ************
 Integrations
 ************
 
 .. toctree::
-    :titlesonly:
+:titlesonly:
 
-    integrations/index
+        integrations/index
 
 
 *****************
 Extra Information
 *****************
 
 .. toctree::
-    :titlesonly:
+:titlesonly:
 
-    ref/index
+        ref/index
 
 

src/App/Registry.php

@@ -238,7 +238,7 @@ protected function hydrateRegistry()
             foreach ($classList as $class) {
                 if (!ArrayHelper::hasKey($classToAppMap, $class)) {
                     throw new OrmException(
-                        "Make '$class' abstract or register it as ".
+                        "Make '$class' abstract or register it as " .
                         'an application model'
                     );
                 }
@@ -347,12 +347,12 @@ public function registerModel(Model $model)
     }
 
     /**
-     * @param callable $callback        the callback to invoke when a model
+     * @param callable $callback the callback to invoke when a model
      *                                  has been created
-     * @param array    $modelsToResolve the model we are waiting for to be
+     * @param array $modelsToResolve the model we are waiting for to be
      *                                  created, the model object is passed to
      *                                  the callback as the first argument
-     * @param array    $kwargs          an associative array to be passed to
+     * @param array $kwargs an associative array to be passed to
      *                                  the callback
      *
      * @since  1.1.0
@@ -440,6 +440,6 @@ public function getPendingOperations()
 
     public function __toString()
     {
-        return (string) sprintf('%s Object', $this->getFullClassName());
+        return (string)sprintf('%s Object', $this->getFullClassName());
     }
 }

src/App/Settings.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the powercomponents package.
+ * This file is part of the powerorm package.
  *
  * (c) Eddilbert Macharia (http://eddmash.com)<edd.cowan@gmail.com>
  *
@@ -11,7 +11,6 @@
 
 namespace Eddmash\PowerOrm\App;
 
-use Eddmash\PowerOrm\Backends\ConnectionInterface;
 use Eddmash\PowerOrm\Helpers\ArrayHelper;
 use Eddmash\PowerOrm\Helpers\ClassHelper;
 use Eddmash\PowerOrm\Signals\SignalManagerInterface;

src/Backends/Connection.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the powercomponents package.
+ * This file is part of the powerorm package.
  *
  * (c) Eddilbert Macharia (http://eddmash.com)<edd.cowan@gmail.com>
  *

src/Backends/ConnectionInterface.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the powercomponents package.
+ * This file is part of the powerorm package.
  *
  * (c) Eddilbert Macharia (http://eddmash.com)<edd.cowan@gmail.com>
  *
@@ -108,8 +108,8 @@ public function transactional(Closure $func);
      * Table expression and columns are not escaped and are not safe for user-input.
      *
      * @param string $tableExpression the expression of the table to insert data into, quoted or unquoted
-     * @param array  $data            an associative array containing column-value pairs
-     * @param array  $types           types of the inserted data
+     * @param array $data an associative array containing column-value pairs
+     * @param array $types types of the inserted data
      *
      * @return int the number of affected rows
      */
@@ -121,9 +121,9 @@ public function insert($tableExpression, array $data, array $types = []);
      *
      * This method supports PDO binding types as well as DBAL mapping types.
      *
-     * @param string $query  the SQL query
-     * @param array  $params the query parameters
-     * @param array  $types  the parameter types
+     * @param string $query the SQL query
+     * @param array $params the query parameters
+     * @param array $types the parameter types
      *
      * @return int the number of affected rows
      *
@@ -134,9 +134,9 @@ public function executeUpdate($query, array $params = [], array $types = []);
     /**
      * Prepares and executes an SQL query and returns the result as an associative array.
      *
-     * @param string $sql    the SQL query
-     * @param array  $params the query parameters
-     * @param array  $types  the query parameter types
+     * @param string $sql the SQL query
+     * @param array $params the query parameters
+     * @param array $types the query parameter types
      *
      * @return array
      */
@@ -148,8 +148,8 @@ public function fetchAll($sql, array $params = [], $types = []);
      * Table expression and columns are not escaped and are not safe for user-input.
      *
      * @param string $tableExpression the expression of the table on which to delete
-     * @param array  $identifier      The deletion criteria. An associative array containing column-value pairs.
-     * @param array  $types           the types of identifiers
+     * @param array $identifier The deletion criteria. An associative array containing column-value pairs.
+     * @param array $types the types of identifiers
      *
      * @return int the number of affected rows
      *
@@ -162,8 +162,8 @@ public function delete($tableExpression, array $identifier, array $types = []);
      * as an associative array.
      *
      * @param string $statement the SQL query
-     * @param array  $params    the query parameters
-     * @param array  $types     the query parameter types
+     * @param array $params the query parameters
+     * @param array $types the query parameter types
      *
      * @return array
      */
@@ -174,8 +174,8 @@ public function fetchAssoc($statement, array $params = [], array $types = []);
      * as a numerically indexed array.
      *
      * @param string $statement the SQL query to be executed
-     * @param array  $params    the prepared statement params
-     * @param array  $types     the query parameter types
+     * @param array $params the prepared statement params
+     * @param array $types the query parameter types
      *
      * @return array
      */
@@ -186,9 +186,9 @@ public function fetchArray($statement, array $params = [], array $types = []);
      * of the first row of the result.
      *
      * @param string $statement the SQL query to be executed
-     * @param array  $params    the prepared statement params
-     * @param int    $column    the 0-indexed column number to retrieve
-     * @param array  $types     the query parameter types
+     * @param array $params the prepared statement params
+     * @param int $column the 0-indexed column number to retrieve
+     * @param array $types the query parameter types
      *
      * @return mixed
      */

src/Backends/Operations/BaseOperations.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the phpgis package.
+ * This file is part of the powerorm package.
  *
  * (c) Eddilbert Macharia (http://eddmash.com)<edd.cowan@gmail.com>
  *