Completed
Pull Request — support/2.0 (#140)
by Paul
11:17
created
PPI/ServiceManager/Options/AppOptions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
             'useDataSource'             => false
66 66
         );
67 67
 
68
-        $defaults['app.root_dir'] = getcwd().'/app';
68
+        $defaults['app.root_dir'] = getcwd() . '/app';
69 69
 
70 70
         return $defaults;
71 71
     }
Please login to merge, or discard this patch.
PPI/ServiceManager/Config/TemplatingConfig.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
                     $serviceManager->get('templating.helper.assets'),
114 114
                     new RouterHelper($serviceManager->get('router')),
115 115
                     new SessionHelper($serviceManager->get('session'))
116
-                 )
116
+                    )
117 117
             );
118 118
         });
119 119
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         $knownEngineIds = array('php', 'smarty', 'twig', 'mustache');
67 67
 
68 68
         // these are the engines selected by the user
69
-        $engineIds = $serviceManager->getOption( 'templating.engines');
69
+        $engineIds = $serviceManager->getOption('templating.engines');
70 70
 
71 71
         // filter templating engines
72 72
         $engineIds = array_intersect($engineIds, $knownEngineIds);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 
136 136
         // Smarty Engine
137 137
         $serviceManager->setFactory('templating.engine.smarty', function($serviceManager) {
138
-            $cacheDir = $serviceManager->getOption('app.cache_dir').DIRECTORY_SEPARATOR.'smarty';
138
+            $cacheDir = $serviceManager->getOption('app.cache_dir') . DIRECTORY_SEPARATOR . 'smarty';
139 139
             $templateLocator = $serviceManager->get('templating.locator');
140 140
 
141 141
             $smartyEngine = new SmartyEngine(
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
         $serviceManager->setFactory('templating', function($serviceManager) use ($engineIds) {
173 173
             $delegatingEngine = new DelegatingEngine();
174 174
             foreach ($engineIds as $id) {
175
-                $delegatingEngine->addEngine($serviceManager->get('templating.engine.'.$id));
175
+                $delegatingEngine->addEngine($serviceManager->get('templating.engine.' . $id));
176 176
             }
177 177
 
178 178
             return $delegatingEngine;
Please login to merge, or discard this patch.
PPI/Test/Unit.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This file is part of the PPI Framework.
4
- *
5
- * @copyright  Copyright (c) 2012 Paul Dragoonis <[email protected]>
6
- * @license    http://opensource.org/licenses/mit-license.php MIT
7
- * @link       http://www.ppi.io
8
- */
3
+     * This file is part of the PPI Framework.
4
+     *
5
+     * @copyright  Copyright (c) 2012 Paul Dragoonis <[email protected]>
6
+     * @license    http://opensource.org/licenses/mit-license.php MIT
7
+     * @link       http://www.ppi.io
8
+     */
9 9
 namespace PPI\Test;
10 10
 
11 11
 abstract class Unit extends \PHPUnit_Framework_TestCase {}
Please login to merge, or discard this patch.
PPI/Http/ResponseInterface.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This file is part of the PPI Framework.
4
- *
5
- * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <[email protected]>
6
- * @license    http://opensource.org/licenses/mit-license.php MIT
7
- * @link       http://www.ppi.io
8
- */
3
+     * This file is part of the PPI Framework.
4
+     *
5
+     * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <[email protected]>
6
+     * @license    http://opensource.org/licenses/mit-license.php MIT
7
+     * @link       http://www.ppi.io
8
+     */
9 9
 
10 10
 namespace PPI\Http;
11 11
 
Please login to merge, or discard this patch.
PPI/Http/Request.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This file is part of the PPI Framework.
4
- *
5
- * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <[email protected]>
6
- * @license    http://opensource.org/licenses/mit-license.php MIT
7
- * @link       http://www.ppi.io
8
- */
3
+     * This file is part of the PPI Framework.
4
+     *
5
+     * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <[email protected]>
6
+     * @license    http://opensource.org/licenses/mit-license.php MIT
7
+     * @link       http://www.ppi.io
8
+     */
9 9
 
10 10
 namespace PPI\Http;
11 11
 
Please login to merge, or discard this patch.
PPI/Http/Response.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This file is part of the PPI Framework.
4
- *
5
- * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <[email protected]>
6
- * @license    http://opensource.org/licenses/mit-license.php MIT
7
- * @link       http://www.ppi.io
8
- */
3
+     * This file is part of the PPI Framework.
4
+     *
5
+     * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <[email protected]>
6
+     * @license    http://opensource.org/licenses/mit-license.php MIT
7
+     * @link       http://www.ppi.io
8
+     */
9 9
 
10 10
 namespace PPI\Http;
11 11
 
Please login to merge, or discard this patch.
PPI/Exception/HandlerInterface.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This file is part of the PPI Framework.
4
- *
5
- * @copyright  Copyright (c) 2012 Paul Dragoonis <[email protected]>
6
- * @license    http://opensource.org/licenses/mit-license.php MIT
7
- * @link       http://www.ppi.io
8
- */
3
+     * This file is part of the PPI Framework.
4
+     *
5
+     * @copyright  Copyright (c) 2012 Paul Dragoonis <[email protected]>
6
+     * @license    http://opensource.org/licenses/mit-license.php MIT
7
+     * @link       http://www.ppi.io
8
+     */
9 9
 namespace PPI\Exception;
10 10
 
11 11
 /**
Please login to merge, or discard this patch.
PPI/Exception/Handler.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,9 +40,9 @@
 block discarded – undo
40 40
         $trace = $e->getTrace();
41 41
 
42 42
         $error = array(
43
-               'file'    => $e->getFile(),
44
-               'line'    => $e->getLine(),
45
-               'message' => $e->getMessage()
43
+                'file'    => $e->getFile(),
44
+                'line'    => $e->getLine(),
45
+                'message' => $e->getMessage()
46 46
         );
47 47
 
48 48
         try {
Please login to merge, or discard this patch.
PPI/DataSource/DataSource.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -134,18 +134,18 @@
 block discarded – undo
134 134
     {
135 135
         switch ($type) {
136 136
 
137
-            case 'mongodb':
138
-                throw new \InvalidArgumentException('Invalid activeQueryFactory type. MongoDB not yet implemented');
139
-                break;
140
-
141
-            case 'couchdb':
142
-                throw new \InvalidArgumentException('Invalid activeQueryFactory type. CouchDB not yet implemented');
143
-                break;
144
-
145
-            case 'pdo':
146
-            default:
147
-                return new \PPI\DataSource\PDO\ActiveQuery($options);
148
-                break;
137
+        case 'mongodb':
138
+            throw new \InvalidArgumentException('Invalid activeQueryFactory type. MongoDB not yet implemented');
139
+            break;
140
+
141
+        case 'couchdb':
142
+            throw new \InvalidArgumentException('Invalid activeQueryFactory type. CouchDB not yet implemented');
143
+            break;
144
+
145
+        case 'pdo':
146
+        default:
147
+            return new \PPI\DataSource\PDO\ActiveQuery($options);
148
+            break;
149 149
         }
150 150
     }
151 151
 
Please login to merge, or discard this patch.