Completed
Pull Request — master (#66)
by
unknown
02:30 queued 46s
created
lumen-test/app/Http/routes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,6 @@
 block discarded – undo
11 11
 |
12 12
 */
13 13
 
14
-$router->get("/", function () use ($router) {
14
+$router->get("/", function() use ($router) {
15 15
     return 'Hello World';
16 16
 });
Please login to merge, or discard this patch.
lumen-test/bootstrap/app.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-require_once __DIR__.'/../vendor/autoload.php';
3
+require_once __DIR__ . '/../vendor/autoload.php';
4 4
 
5 5
 try {
6
-    (new Dotenv\Dotenv(__DIR__.'/../'))->load();
6
+    (new Dotenv\Dotenv(__DIR__ . '/../'))->load();
7 7
 } catch (Dotenv\Exception\InvalidPathException $e) {
8 8
     //
9 9
 }
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 */
21 21
 
22 22
 $app = new Laravel\Lumen\Application(
23
-    realpath(__DIR__.'/../')
23
+    realpath(__DIR__ . '/../')
24 24
 );
25 25
 
26 26
 $app->withFacades();
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 
99 99
 $app->router->group([
100 100
     'namespace' => 'App\Http\Controllers',
101
-], function ($router) {
102
-    require __DIR__.'/../app/Http/routes.php';
101
+], function($router) {
102
+    require __DIR__ . '/../app/Http/routes.php';
103 103
 });
104 104
 
105 105
 return $app;
Please login to merge, or discard this patch.
lumen-test/tests/acceptance/ResourceCommandCept.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -14,10 +14,10 @@  discard block
 block discarded – undo
14 14
 $I->seeInThisFile('protected $fillable = ["name", "descr", "due", "project_id", "creator_id"];');
15 15
 $I->seeInThisFile('protected $dates = ["due"];');
16 16
 $I->seeInThisFile(
17
-"public static \$rules = [\n".
17
+"public static \$rules = [\n" .
18 18
 "        \"name\" => \"requied\"," . PHP_EOL .
19 19
 "        \"project_id\" => \"required|numeric\"," . PHP_EOL .
20
-"        \"creator_id\" => \"required|numeric\",\n".
20
+"        \"creator_id\" => \"required|numeric\",\n" .
21 21
 "    ];");
22 22
 $I->seeInThisFile(
23 23
 '    public function tags()
@@ -47,19 +47,19 @@  discard block
 block discarded – undo
47 47
 $I->openFile('./database/migrations/create_task_categories.php');
48 48
 
49 49
 $I->seeInThisFile('class CreateTaskCategoriesTable extends Migration');
50
-$I->seeInThisFile("Schema::create('task_categories', function(Blueprint \$table) {\n".
51
-"            \$table->increments('id');\n".
50
+$I->seeInThisFile("Schema::create('task_categories', function(Blueprint \$table) {\n" .
51
+"            \$table->increments('id');\n" .
52 52
 "            \$table->string('name')->unique();" . PHP_EOL .
53 53
 "            \$table->text('descr')->nullable();" . PHP_EOL .
54 54
 "            \$table->timestamp('due');" . PHP_EOL .
55
-"            \$table->integer('project_id')->unsigned();" . PHP_EOL.
55
+"            \$table->integer('project_id')->unsigned();" . PHP_EOL .
56 56
 "            \$table->integer('creator_id')->unsigned();\n" .
57
-"            \$table->foreign('project_id')\n".
58
-"                ->references('id')\n".
57
+"            \$table->foreign('project_id')\n" .
58
+"                ->references('id')\n" .
59 59
 "                ->on('projects');" . PHP_EOL .
60
-"            \$table->foreign('creator_id')\n".
61
-"                ->references('id')\n".
62
-"                ->on('users');\n".
60
+"            \$table->foreign('creator_id')\n" .
61
+"                ->references('id')\n" .
62
+"                ->on('users');\n" .
63 63
 "            \$table->timestamps();");
64 64
 
65 65
 $I->deleteFile('./database/migrations/create_task_categories.php');
Please login to merge, or discard this patch.
src/CommandsServiceProvider.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -22,92 +22,92 @@
 block discarded – undo
22 22
         // registerTestCommand
23 23
     }
24 24
 
25
-    protected function registerModelCommand(){
26
-        $this->app->singleton('command.wn.model', function($app){
25
+    protected function registerModelCommand() {
26
+        $this->app->singleton('command.wn.model', function($app) {
27 27
             return $app['Wn\Generators\Commands\ModelCommand'];
28 28
         });
29 29
         $this->commands('command.wn.model');
30 30
     }
31 31
 
32
-    protected function registerControllerRestActionsCommand(){
33
-        $this->app->singleton('command.wn.controller.rest-actions', function($app){
32
+    protected function registerControllerRestActionsCommand() {
33
+        $this->app->singleton('command.wn.controller.rest-actions', function($app) {
34 34
             return $app['Wn\Generators\Commands\ControllerRestActionsCommand'];
35 35
         });
36 36
         $this->commands('command.wn.controller.rest-actions');
37 37
     }
38 38
 
39
-    protected function registerControllerCommand(){
40
-        $this->app->singleton('command.wn.controller', function($app){
39
+    protected function registerControllerCommand() {
40
+        $this->app->singleton('command.wn.controller', function($app) {
41 41
             return $app['Wn\Generators\Commands\ControllerCommand'];
42 42
         });
43 43
         $this->commands('command.wn.controller');
44 44
     }
45 45
 
46
-    protected function registerMigrationCommand(){
47
-        $this->app->singleton('command.wn.migration', function($app){
46
+    protected function registerMigrationCommand() {
47
+        $this->app->singleton('command.wn.migration', function($app) {
48 48
             return $app['Wn\Generators\Commands\MigrationCommand'];
49 49
         });
50 50
         $this->commands('command.wn.migration');
51 51
     }
52 52
 
53
-    protected function registerRouteCommand(){
54
-        $this->app->singleton('command.wn.route', function($app){
53
+    protected function registerRouteCommand() {
54
+        $this->app->singleton('command.wn.route', function($app) {
55 55
             return $app['Wn\Generators\Commands\RouteCommand'];
56 56
         });
57 57
         $this->commands('command.wn.route');
58 58
     }
59 59
 
60
-    protected function registerTestCommand(){
61
-        $this->app->singleton('command.wn.test', function($app){
60
+    protected function registerTestCommand() {
61
+        $this->app->singleton('command.wn.test', function($app) {
62 62
             return $app['Wn\Generators\Commands\TestCommand'];
63 63
         });
64 64
         $this->commands('command.wn.test');
65 65
     }
66 66
 
67
-    protected function registerResourceCommand(){
68
-        $this->app->singleton('command.wn.resource', function($app){
67
+    protected function registerResourceCommand() {
68
+        $this->app->singleton('command.wn.resource', function($app) {
69 69
             return $app['Wn\Generators\Commands\ResourceCommand'];
70 70
         });
71 71
         $this->commands('command.wn.resource');
72 72
     }
73 73
 
74
-    protected function registerResourcesCommand(){
75
-        $this->app->singleton('command.wn.resources', function($app){
74
+    protected function registerResourcesCommand() {
75
+        $this->app->singleton('command.wn.resources', function($app) {
76 76
             return $app['Wn\Generators\Commands\ResourcesCommand'];
77 77
         });
78 78
         $this->commands('command.wn.resources');
79 79
     }
80 80
 
81
-    protected function registerPivotTableCommand(){
82
-        $this->app->singleton('command.wn.pivot-table', function($app){
81
+    protected function registerPivotTableCommand() {
82
+        $this->app->singleton('command.wn.pivot-table', function($app) {
83 83
             return $app['Wn\Generators\Commands\PivotTableCommand'];
84 84
         });
85 85
         $this->commands('command.wn.pivot-table');
86 86
     }
87 87
 
88
-    protected function registerMorphTableCommand(){
89
-        $this->app->singleton('command.wn.morph-table', function($app){
88
+    protected function registerMorphTableCommand() {
89
+        $this->app->singleton('command.wn.morph-table', function($app) {
90 90
             return $app['Wn\Generators\Commands\MorphTableCommand'];
91 91
         });
92 92
         $this->commands('command.wn.morph-table');
93 93
     }
94 94
 
95
-    protected function registerFactoryCommand(){
96
-        $this->app->singleton('command.wn.factory', function($app){
95
+    protected function registerFactoryCommand() {
96
+        $this->app->singleton('command.wn.factory', function($app) {
97 97
             return $app['Wn\Generators\Commands\FactoryCommand'];
98 98
         });
99 99
         $this->commands('command.wn.factory');
100 100
     }
101 101
 
102
-    protected function registerSeederCommand(){
103
-        $this->app->singleton('command.wn.seeder', function($app){
102
+    protected function registerSeederCommand() {
103
+        $this->app->singleton('command.wn.seeder', function($app) {
104 104
             return $app['Wn\Generators\Commands\SeederCommand'];
105 105
         });
106 106
         $this->commands('command.wn.seeder');
107 107
     }
108 108
 
109
-    protected function registerPivotSeederCommand(){
110
-        $this->app->singleton('command.wn.pivot.seeder', function($app){
109
+    protected function registerPivotSeederCommand() {
110
+        $this->app->singleton('command.wn.pivot.seeder', function($app) {
111 111
             return $app['Wn\Generators\Commands\PivotSeederCommand'];
112 112
         });
113 113
         $this->commands('command.wn.pivot.seeder');
Please login to merge, or discard this patch.
src/Commands/FactoryCommand.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@  discard block
 block discarded – undo
19 19
 
20 20
         $file = $this->getFile();
21 21
 
22
-        $content = ! $this->fs->exists($file) ? '' : $this->fs->get($file);
22
+        $content = !$this->fs->exists($file) ? '' : $this->fs->get($file);
23 23
 
24
-        $content .= $this->getTemplate(! $this->fs->exists($file) ? 'factory-create' : 'factory')
24
+        $content .= $this->getTemplate(!$this->fs->exists($file) ? 'factory-create' : 'factory')
25 25
             ->with([
26 26
                 'model' => $model,
27 27
                 'factory_fields' => $this->getFieldsContent()
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     protected function getFile()
35 35
     {
36 36
         $file = $this->option('file');
37
-        if(! $file){
37
+        if (!$file) {
38 38
             $file = './database/factories/ModelFactory.php';
39 39
         }
40 40
         return $file;
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
 
47 47
         $fields = $this->option('fields');
48 48
 
49
-        if($fields){
50
-            if(! $this->option('parsed')){
49
+        if ($fields) {
50
+            if (!$this->option('parsed')) {
51 51
                 $fields = $this->getArgumentParser('factory-fields')->parse($fields);
52 52
             }
53 53
             $template = $this->getTemplate('factory/field');
54
-            foreach($fields as $field){
54
+            foreach ($fields as $field) {
55 55
                 $content[] = $template->with($field)->get();
56 56
             }
57 57
             $content = implode(PHP_EOL, $content);
Please login to merge, or discard this patch.
src/Commands/ResourceCommand.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
             '--parsed' => true
75 75
         ]);
76 76
 
77
-        if (! $this->option('no-controller')) {
77
+        if (!$this->option('no-controller')) {
78 78
             // generating REST actions trait if doesn't exist
79
-            if(! $this->fs->exists('./app/Http/Controllers/RESTActions.php')){
79
+            if (!$this->fs->exists('./app/Http/Controllers/RESTActions.php')) {
80 80
                 $this->call('wn:controller:rest-actions');
81 81
             }
82 82
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 
101 101
         // generating model factory
102 102
         $this->call('wn:factory', [
103
-            'model' => $this->getNamespace().'\\'.$modelName,
104
-            '--file' => './database/factories/'.str_plural($modelName).'.php',
103
+            'model' => $this->getNamespace() . '\\' . $modelName,
104
+            '--file' => './database/factories/' . str_plural($modelName) . '.php',
105 105
             '--fields' => $this->factoryFields(),
106 106
             '--force' => $this->option('force'),
107 107
             '--parsed' => true
@@ -117,10 +117,10 @@  discard block
 block discarded – undo
117 117
     protected function parseFields()
118 118
     {
119 119
         $fields = $this->argument('fields');
120
-        if($this->option('parsed')){
120
+        if ($this->option('parsed')) {
121 121
             $this->fields = $fields;
122 122
         } else {
123
-            if(! $fields){
123
+            if (!$fields) {
124 124
                 $this->fields = [];
125 125
             } else {
126 126
                 $this->fields = $this->getArgumentParser('fields')
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
                     if ($name['nullable']) {
152 152
                         $return['schema'][] = ['name' => 'nullable', 'args' => []];
153 153
                     } else {
154
-                        $return['rules'] = 'required'.(!empty($return['rules'])?'|'.$return['rules']:'');
154
+                        $return['rules'] = 'required' . (!empty($return['rules']) ? '|' . $return['rules'] : '');
155 155
                     }
156 156
                 } else {
157 157
                     $return['schema'] = [
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 
171 171
     protected function fieldsHavingTag($tag)
172 172
     {
173
-        return array_map(function($field){
173
+        return array_map(function($field) {
174 174
             return $field['name'];
175 175
         }, array_filter($this->fields, function($field) use($tag){
176 176
             return in_array($tag, $field['tags']);
@@ -179,19 +179,19 @@  discard block
 block discarded – undo
179 179
 
180 180
     protected function rules()
181 181
     {
182
-        return array_map(function($field){
182
+        return array_map(function($field) {
183 183
             return [
184 184
                 'name' => $field['name'],
185 185
                 'rule' => $field['rules']
186 186
             ];
187
-        }, array_filter($this->fields, function($field){
187
+        }, array_filter($this->fields, function($field) {
188 188
             return !empty($field['rules']);
189 189
         }));
190 190
     }
191 191
 
192 192
     protected function schema()
193 193
     {
194
-        return array_map(function($field){
194
+        return array_map(function($field) {
195 195
             return array_merge([[
196 196
                 'name' => $field['name'],
197 197
                 'args' => []
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 
202 202
     protected function getBaseModel($path) {
203 203
         $index = strrpos($path, "\\");
204
-        if($index) {
204
+        if ($index) {
205 205
             return substr($path, $index + 1);
206 206
         }
207 207
         return $path;
@@ -212,19 +212,19 @@  discard block
 block discarded – undo
212 212
         $belongsTo = $this->option('belongs-to');
213 213
         $morphTo = $this->option('morph-to');
214 214
 
215
-        if(! $belongsTo && (! $withMorph || ! $morphTo)) {
215
+        if (!$belongsTo && (!$withMorph || !$morphTo)) {
216 216
             return [];
217 217
         }
218 218
 
219 219
         $belongsTo = $belongsTo ? $this->getArgumentParser('relations')->parse($belongsTo) : [];
220 220
 
221
-        $belongsTo = array_map(function($relation){
221
+        $belongsTo = array_map(function($relation) {
222 222
             return array("model" => camel_case(str_singular($this->getBaseModel($relation['model'] ? $relation['model'] : $relation['name']))), "name" => snake_case(str_singular($this->getBaseModel($relation['name']))) . '_id', "type" => "belongsTo");
223 223
         }, $belongsTo);
224 224
 
225 225
         if ($withMorph) {
226 226
             $morphTo = $morphTo ? $this->getArgumentParser('relations-morphTo')->parse($morphTo) : [];
227
-            $morphTo = array_map(function($relation){
227
+            $morphTo = array_map(function($relation) {
228 228
                 $name = snake_case(str_singular($relation['name']));
229 229
                 return array(array("name" => $name . '_id', "type" => "morphTo", "nullable" => $relation['nullable']), array("name" => $name . '_type', "type" => "morphTo", "nullable" => $relation['nullable']));
230 230
             }, $morphTo);
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 
254 254
     protected function factoryFields()
255 255
     {
256
-        return array_map(function($field){
256
+        return array_map(function($field) {
257 257
             return [
258 258
                 'name' => $field['name'],
259 259
                 'type' => $field['factory']
260 260
             ];
261
-        }, array_filter($this->fields, function($field){
261
+        }, array_filter($this->fields, function($field) {
262 262
             return isset($field['factory']) && $field['factory'];
263 263
         }));
264 264
     }
Please login to merge, or discard this patch.
src/Commands/ControllerCommand.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 	protected $signature = 'wn:controller
11 11
         {model : Name of the model (with namespace if not App)}
12
-		{--path='.ControllerCommand::DEFAULT_PATH.' : where to store the controllers file.}
12
+		{--path='.ControllerCommand::DEFAULT_PATH . ' : where to store the controllers file.}
13 13
 		{--no-routes= : without routes}
14 14
         {--routes= : where to store the routes.}
15 15
         {--force= : override the existing files}
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     {
23 23
     	$model = $this->argument('model');
24 24
     	$name = '';
25
-    	if(strrpos($model, "\\") === false){
25
+    	if (strrpos($model, "\\") === false) {
26 26
     		$name = $model;
27 27
     		$model = "App\\" . $model;
28 28
     	} else {
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
         		'name' => $controller,
36 36
         		'model' => $model,
37 37
 				'namespace' => $this->getNamespace(),
38
-				'use' => ($this->getNamespace() != $this->getDefaultNamespace()?'use '.$this->getDefaultNamespace().'\Controller;'.PHP_EOL.'use '.$this->getDefaultNamespace().'\RESTActions;'.PHP_EOL:'')
38
+				'use' => ($this->getNamespace() != $this->getDefaultNamespace() ? 'use ' . $this->getDefaultNamespace() . '\Controller;' . PHP_EOL . 'use ' . $this->getDefaultNamespace() . '\RESTActions;' . PHP_EOL : '')
39 39
         	])
40 40
         	->get();
41 41
 
42 42
         $this->save($content, "./{$this->option('path')}/{$controller}.php", "{$controller}");
43 43
 
44
-        if(! $this->option('no-routes')){
44
+        if (!$this->option('no-routes')) {
45 45
             $options = [
46 46
                 'resource' => snake_case($name, '-'),
47 47
                 '--controller' => $controller,
Please login to merge, or discard this patch.
src/Commands/MorphTableCommand.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
     protected function parseFields()
34 34
     {
35 35
         $this->fields = array_map(function($arg, $app) {
36
-            return snake_case(str_singular($this->argument($arg)))."_".$app;
36
+            return snake_case(str_singular($this->argument($arg))) . "_" . $app;
37 37
         }, ['model', 'morphable', 'morphable'], ['id', 'id', 'type']);
38 38
 
39 39
     }
40 40
 
41 41
     protected function schema()
42 42
     {
43
-        return implode(' ', array_map(function($field){
43
+        return implode(' ', array_map(function($field) {
44 44
             return $field . ':' . (substr($field, -3) == '_id' ? 'integer:unsigned' : 'string.50') . ':index';
45 45
         }, $this->fields));
46 46
     }
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     protected function keys()
49 49
     {
50 50
         // return implode(' ', $this->fields);
51
-		return snake_case(str_singular($this->argument('model')))."_id";
51
+		return snake_case(str_singular($this->argument('model'))) . "_id";
52 52
     }
53 53
 
54 54
 }
Please login to merge, or discard this patch.
src/Commands/MigrationCommand.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
         $snakeName = snake_case($name);
25 25
 
26 26
         $file = $this->option('file');
27
-        if (! $file) {
27
+        if (!$file) {
28 28
             $file = date('Y_m_d_His_') . $snakeName . '_table';
29 29
             $this->deleteOldMigration($snakeName);
30 30
         } else {
@@ -46,10 +46,10 @@  discard block
 block discarded – undo
46 46
 
47 47
     protected function deleteOldMigration($fileName)
48 48
     {
49
-        foreach (new \DirectoryIterator("./database/migrations/") as $fileInfo){
50
-            if($fileInfo->isDot()) continue;
49
+        foreach (new \DirectoryIterator("./database/migrations/") as $fileInfo) {
50
+            if ($fileInfo->isDot()) continue;
51 51
 
52
-            if(strpos($fileInfo->getFilename(), $fileName) !== FALSE){
52
+            if (strpos($fileInfo->getFilename(), $fileName) !== FALSE) {
53 53
                 unlink($fileInfo->getPathname());
54 54
             }
55 55
         }
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
         $name = $parts[0]['name'];
93 93
         $parts[1]['args'] = array_merge(["'{$name}'"], $parts[1]['args']);
94 94
         unset($parts[0]);
95
-        $parts = array_map(function($part){
95
+        $parts = array_map(function($part) {
96 96
             return '->' . $part['name'] . '(' . implode(', ', $part['args']) . ')';
97 97
         }, $parts);
98 98
         return "            \$table" . implode('', $parts) . ';';
@@ -115,10 +115,10 @@  discard block
 block discarded – undo
115 115
 
116 116
     protected function getConstraintDeclaration($key)
117 117
     {
118
-        if(! $key['column']){
118
+        if (!$key['column']) {
119 119
             $key['column'] = 'id';
120 120
         }
121
-        if(! $key['table']){
121
+        if (!$key['table']) {
122 122
             $key['table'] = substr($key['name'], 0, count($key['name']) - 4);
123 123
         }
124 124
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
             ])
131 131
             ->get();
132 132
 
133
-        if($key['on_delete']){
133
+        if ($key['on_delete']) {
134 134
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
135 135
                     ->with([
136 136
                         'event' => 'Delete',
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
                     ->get();
140 140
         }
141 141
 
142
-        if($key['on_update']){
142
+        if ($key['on_update']) {
143 143
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
144 144
                     ->with([
145 145
                         'event' => 'Update',
Please login to merge, or discard this patch.