Completed
Branch master (fa5654)
by dima
03:39
created
app/Models/Task/Base/Task.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
             throw new PropelException('Cannot insert a value for auto-increment primary key (' . TaskTableMap::COL_ID . ')');
669 669
         }
670 670
 
671
-         // check the columns in natural order for more readable SQL queries
671
+            // check the columns in natural order for more readable SQL queries
672 672
         if ($this->isColumnModified(TaskTableMap::COL_ID)) {
673 673
             $modifiedColumns[':p' . $index++]  = 'id';
674 674
         }
@@ -900,25 +900,25 @@  discard block
 block discarded – undo
900 900
         }
901 901
     }
902 902
 
903
-     /**
904
-     * Populate the current object from a string, using a given parser format
905
-     * <code>
906
-     * $book = new Book();
907
-     * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
908
-     * </code>
909
-     *
910
-     * You can specify the key type of the array by additionally passing one
911
-     * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME,
912
-     * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
913
-     * The default key type is the column's TableMap::TYPE_PHPNAME.
914
-     *
915
-     * @param mixed $parser A AbstractParser instance,
916
-     *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
917
-     * @param string $data The source data to import from
918
-     * @param string $keyType The type of keys the array uses.
919
-     *
920
-     * @return $this|\Models\Task\Task The current object, for fluid interface
921
-     */
903
+        /**
904
+         * Populate the current object from a string, using a given parser format
905
+         * <code>
906
+         * $book = new Book();
907
+         * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
908
+         * </code>
909
+         *
910
+         * You can specify the key type of the array by additionally passing one
911
+         * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME,
912
+         * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
913
+         * The default key type is the column's TableMap::TYPE_PHPNAME.
914
+         *
915
+         * @param mixed $parser A AbstractParser instance,
916
+         *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
917
+         * @param string $data The source data to import from
918
+         * @param string $keyType The type of keys the array uses.
919
+         *
920
+         * @return $this|\Models\Task\Task The current object, for fluid interface
921
+         */
922 922
     public function importFrom($parser, $data, $keyType = TableMap::TYPE_PHPNAME)
923 923
     {
924 924
         if (!$parser instanceof AbstractParser) {
Please login to merge, or discard this patch.
app/Models/User/Map/UserTableMap.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -365,8 +365,8 @@
 block discarded – undo
365 365
      * @throws PropelException Any exceptions caught during processing will be
366 366
      *                         rethrown wrapped into a PropelException.
367 367
      */
368
-     public static function doDelete($values, ConnectionInterface $con = null)
369
-     {
368
+        public static function doDelete($values, ConnectionInterface $con = null)
369
+        {
370 370
         if (null === $con) {
371 371
             $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
372 372
         }
Please login to merge, or discard this patch.
app/Models/User/Base/UserQuery.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,6 @@
 block discarded – undo
49 49
  * @method     ChildUser findOneByRememberToken(string $remember_token) Return the first ChildUser filtered by the remember_token column
50 50
  * @method     ChildUser findOneByCreatedAt(string $created_at) Return the first ChildUser filtered by the created_at column
51 51
  * @method     ChildUser findOneByUpdatedAt(string $updated_at) Return the first ChildUser filtered by the updated_at column *
52
-
53 52
  * @method     ChildUser requirePk($key, ConnectionInterface $con = null) Return the ChildUser by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
54 53
  * @method     ChildUser requireOne(ConnectionInterface $con = null) Return the first ChildUser matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
55 54
  *
Please login to merge, or discard this patch.
app/Models/User/Base/User.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
             throw new PropelException('Cannot insert a value for auto-increment primary key (' . UserTableMap::COL_ID . ')');
825 825
         }
826 826
 
827
-         // check the columns in natural order for more readable SQL queries
827
+            // check the columns in natural order for more readable SQL queries
828 828
         if ($this->isColumnModified(UserTableMap::COL_ID)) {
829 829
             $modifiedColumns[':p' . $index++]  = 'id';
830 830
         }
@@ -1120,25 +1120,25 @@  discard block
 block discarded – undo
1120 1120
         }
1121 1121
     }
1122 1122
 
1123
-     /**
1124
-     * Populate the current object from a string, using a given parser format
1125
-     * <code>
1126
-     * $book = new Book();
1127
-     * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
1128
-     * </code>
1129
-     *
1130
-     * You can specify the key type of the array by additionally passing one
1131
-     * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME,
1132
-     * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
1133
-     * The default key type is the column's TableMap::TYPE_PHPNAME.
1134
-     *
1135
-     * @param mixed $parser A AbstractParser instance,
1136
-     *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
1137
-     * @param string $data The source data to import from
1138
-     * @param string $keyType The type of keys the array uses.
1139
-     *
1140
-     * @return $this|\Models\User\User The current object, for fluid interface
1141
-     */
1123
+        /**
1124
+         * Populate the current object from a string, using a given parser format
1125
+         * <code>
1126
+         * $book = new Book();
1127
+         * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
1128
+         * </code>
1129
+         *
1130
+         * You can specify the key type of the array by additionally passing one
1131
+         * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME,
1132
+         * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
1133
+         * The default key type is the column's TableMap::TYPE_PHPNAME.
1134
+         *
1135
+         * @param mixed $parser A AbstractParser instance,
1136
+         *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
1137
+         * @param string $data The source data to import from
1138
+         * @param string $keyType The type of keys the array uses.
1139
+         *
1140
+         * @return $this|\Models\User\User The current object, for fluid interface
1141
+         */
1142 1142
     public function importFrom($parser, $data, $keyType = TableMap::TYPE_PHPNAME)
1143 1143
     {
1144 1144
         if (!$parser instanceof AbstractParser) {
Please login to merge, or discard this patch.
app/Models/Task/Map/TaskTableMap.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -365,8 +365,8 @@
 block discarded – undo
365 365
      * @throws PropelException Any exceptions caught during processing will be
366 366
      *                         rethrown wrapped into a PropelException.
367 367
      */
368
-     public static function doDelete($values, ConnectionInterface $con = null)
369
-     {
368
+        public static function doDelete($values, ConnectionInterface $con = null)
369
+        {
370 370
         if (null === $con) {
371 371
             $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
372 372
         }
Please login to merge, or discard this patch.
app/Models/Task/Base/TaskQuery.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,6 @@
 block discarded – undo
49 49
  * @method     ChildUser findOneByRememberToken(string $remember_token) Return the first ChildUser filtered by the remember_token column
50 50
  * @method     ChildUser findOneByCreatedAt(string $created_at) Return the first ChildUser filtered by the created_at column
51 51
  * @method     ChildUser findOneByUpdatedAt(string $updated_at) Return the first ChildUser filtered by the updated_at column *
52
-
53 52
  * @method     ChildUser requirePk($key, ConnectionInterface $con = null) Return the ChildUser by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
54 53
  * @method     ChildUser requireOne(ConnectionInterface $con = null) Return the first ChildUser matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
55 54
  *
Please login to merge, or discard this patch.
bootstrap/config.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -4,22 +4,22 @@
 block discarded – undo
4 4
 $serviceContainer->setAdapterClass('default', 'mysql');
5 5
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
6 6
 $manager->setConfiguration(array (
7
-  'classname' => 'Propel\\Runtime\\Connection\\ProfilerConnectionWrapper',
8
-  'dsn' => 'mysql:host=localhost:3336;dbname=homestead',
9
-  'user' => 'root',
10
-  'password' => '319114',
11
-  'attributes' =>
12
-  array (
7
+    'classname' => 'Propel\\Runtime\\Connection\\ProfilerConnectionWrapper',
8
+    'dsn' => 'mysql:host=localhost:3336;dbname=homestead',
9
+    'user' => 'root',
10
+    'password' => '319114',
11
+    'attributes' =>
12
+    array (
13 13
     'ATTR_EMULATE_PREPARES' => false,
14
-  ),
15
-  'settings' =>
16
-  array (
14
+    ),
15
+    'settings' =>
16
+    array (
17 17
     'charset' => 'utf8',
18 18
     'queries' =>
19 19
     array (
20
-      'utf8' => 'SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci',
20
+        'utf8' => 'SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci',
21
+    ),
21 22
     ),
22
-  ),
23 23
 ));
24 24
 $manager->setName('default');
25 25
 $serviceContainer->setConnectionManager('default', $manager);
Please login to merge, or discard this patch.
app/Price/Models/Selfprice/Map/SelfpriceTableMap.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -365,8 +365,8 @@
 block discarded – undo
365 365
      * @throws PropelException Any exceptions caught during processing will be
366 366
      *                         rethrown wrapped into a PropelException.
367 367
      */
368
-     public static function doDelete($values, ConnectionInterface $con = null)
369
-     {
368
+        public static function doDelete($values, ConnectionInterface $con = null)
369
+        {
370 370
         if (null === $con) {
371 371
             $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
372 372
         }
Please login to merge, or discard this patch.
app/Price/Models/Selfprice/Base/Selfprice.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
             throw new PropelException('Cannot insert a value for auto-increment primary key (' . SelfpriceTableMap::COL_ID . ')');
695 695
         }
696 696
 
697
-         // check the columns in natural order for more readable SQL queries
697
+            // check the columns in natural order for more readable SQL queries
698 698
         if ($this->isColumnModified(SelfpriceTableMap::COL_ID)) {
699 699
             $modifiedColumns[':p' . $index++]  = 'id';
700 700
         }
@@ -936,25 +936,25 @@  discard block
 block discarded – undo
936 936
         }
937 937
     }
938 938
 
939
-     /**
940
-     * Populate the current object from a string, using a given parser format
941
-     * <code>
942
-     * $book = new Book();
943
-     * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
944
-     * </code>
945
-     *
946
-     * You can specify the key type of the array by additionally passing one
947
-     * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME,
948
-     * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
949
-     * The default key type is the column's TableMap::TYPE_PHPNAME.
950
-     *
951
-     * @param mixed $parser A AbstractParser instance,
952
-     *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
953
-     * @param string $data The source data to import from
954
-     * @param string $keyType The type of keys the array uses.
955
-     *
956
-     * @return $this|\Price\Models\Selfprice\Selfprice The current object, for fluid interface
957
-     */
939
+        /**
940
+         * Populate the current object from a string, using a given parser format
941
+         * <code>
942
+         * $book = new Book();
943
+         * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
944
+         * </code>
945
+         *
946
+         * You can specify the key type of the array by additionally passing one
947
+         * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME,
948
+         * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
949
+         * The default key type is the column's TableMap::TYPE_PHPNAME.
950
+         *
951
+         * @param mixed $parser A AbstractParser instance,
952
+         *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
953
+         * @param string $data The source data to import from
954
+         * @param string $keyType The type of keys the array uses.
955
+         *
956
+         * @return $this|\Price\Models\Selfprice\Selfprice The current object, for fluid interface
957
+         */
958 958
     public function importFrom($parser, $data, $keyType = TableMap::TYPE_PHPNAME)
959 959
     {
960 960
         if (!$parser instanceof AbstractParser) {
Please login to merge, or discard this patch.