Completed
Push — master ( 0e8d16...6b3373 )
by Aimeos
02:46
created
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -36,18 +36,18 @@
 block discarded – undo
36 36
 	 * @param \Illuminate\Http\Request $request Laravel request object
37 37
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
38 38
 	 */
39
-	public function indexAction( Request $request )
39
+	public function indexAction(Request $request)
40 40
 	{
41
-		if( config( 'shop.authorize', true ) && !( Auth::check() && $request->user()->can( 'admin' ) ) ) {
42
-			return View::make( 'shop::admin.index' );
41
+		if (config('shop.authorize', true) && !(Auth::check() && $request->user()->can('admin'))) {
42
+			return View::make('shop::admin.index');
43 43
 		}
44 44
 
45 45
 		$param = array(
46 46
 			'resource' => 'product',
47
-			'site' => Route::input( 'site', 'default' ),
48
-			'lang' => Input::get( 'lang', config( 'app.locale', 'en' ) ),
47
+			'site' => Route::input('site', 'default'),
48
+			'lang' => Input::get('lang', config('app.locale', 'en')),
49 49
 		);
50 50
 
51
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
51
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
52 52
 	}
53 53
 }
54 54
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Aimeos.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
36 36
 	 */
37
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
37
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
38 38
 	{
39 39
 		$this->config = $config;
40 40
 	}
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function get()
49 49
 	{
50
-		if( $this->object === null )
50
+		if ($this->object === null)
51 51
 		{
52
-			$extDirs = (array) $this->config->get( 'shop.extdir', array() );
53
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
52
+			$extDirs = (array) $this->config->get('shop.extdir', array());
53
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
54 54
 		}
55 55
 
56 56
 		return $this->object;
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
 	 */
65 65
 	public function getVersion()
66 66
 	{
67
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
68
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
67
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
68
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
69 69
 		) {
70
-			foreach( (array) $content['packages'] as $item )
70
+			foreach ((array) $content['packages'] as $item)
71 71
 			{
72
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
72
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
73 73
 					return $item['version'];
74 74
 				}
75 75
 			}
Please login to merge, or discard this patch.
src/routes.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 Route::group(config('shop.routes.login', ['middleware' => ['web']]), function() {
4 4
 
5
-	Route::match( array( 'GET' ), 'admin', array(
5
+	Route::match(array('GET'), 'admin', array(
6 6
 		'as' => 'aimeos_shop_admin',
7 7
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
8 8
 	));
@@ -12,99 +12,99 @@  discard block
 block discarded – undo
12 12
 
13 13
 Route::group(config('shop.routes.admin', ['middleware' => ['web', 'auth']]), function() {
14 14
 
15
-	Route::match( array( 'GET' ), 'extadm', array(
15
+	Route::match(array('GET'), 'extadm', array(
16 16
 		'as' => 'aimeos_shop_extadm',
17 17
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction'
18 18
 	));
19 19
 
20
-	Route::match( array( 'GET' ), 'extadm/file', array(
20
+	Route::match(array('GET'), 'extadm/file', array(
21 21
 		'as' => 'aimeos_shop_extadm_file',
22 22
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction'
23 23
 	));
24 24
 
25
-	Route::match( array( 'POST' ), 'extadm/do', array(
25
+	Route::match(array('POST'), 'extadm/do', array(
26 26
 		'as' => 'aimeos_shop_extadm_json',
27 27
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction'
28 28
 	));
29 29
 
30 30
 
31
-	Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array(
31
+	Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array(
32 32
 		'as' => 'aimeos_shop_jqadm_copy',
33 33
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
34
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
34
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
35 35
 
36
-	Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array(
36
+	Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array(
37 37
 		'as' => 'aimeos_shop_jqadm_create',
38 38
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
39
-	))->where( array( 'resource' => '[^0-9]+' ) );
39
+	))->where(array('resource' => '[^0-9]+'));
40 40
 
41
-	Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array(
41
+	Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array(
42 42
 		'as' => 'aimeos_shop_jqadm_delete',
43 43
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
44
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
44
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
45 45
 
46
-	Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array(
46
+	Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array(
47 47
 		'as' => 'aimeos_shop_jqadm_get',
48 48
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
49
-	))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]+' ) );
49
+	))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]+'));
50 50
 
51
-	Route::match( array( 'POST' ), 'jqadm/save/{resource}/{id?}', array(
51
+	Route::match(array('POST'), 'jqadm/save/{resource}/{id?}', array(
52 52
 		'as' => 'aimeos_shop_jqadm_save',
53 53
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
54
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
54
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
55 55
 
56
-	Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array(
56
+	Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array(
57 57
 		'as' => 'aimeos_shop_jqadm_search',
58 58
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
59
-	))->where( array( 'resource' => '[^0-9]+' ) );
59
+	))->where(array('resource' => '[^0-9]+'));
60 60
 
61 61
 
62
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
62
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
63 63
 		'as' => 'aimeos_shop_jsonadm_delete',
64 64
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
65
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
65
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
66 66
 
67
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
67
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
68 68
 		'as' => 'aimeos_shop_jsonadm_get',
69 69
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
70
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
70
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
71 71
 
72
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
72
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
73 73
 		'as' => 'aimeos_shop_jsonadm_patch',
74 74
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
75
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
75
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
76 76
 
77
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
77
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
78 78
 		'as' => 'aimeos_shop_jsonadm_post',
79 79
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
80
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
80
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
81 81
 
82
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
82
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
83 83
 		'as' => 'aimeos_shop_jsonadm_put',
84 84
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
85
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
85
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
86 86
 
87
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
87
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
88 88
 		'as' => 'aimeos_shop_jsonadm_options',
89 89
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
90
-	))->where( array( 'resource' => '[^0-9]*' ) );
90
+	))->where(array('resource' => '[^0-9]*'));
91 91
 
92 92
 });
93 93
 
94 94
 
95 95
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
96 96
 
97
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
97
+	Route::match(array('GET', 'POST'), 'myaccount', array(
98 98
 		'as' => 'aimeos_shop_account',
99 99
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
100 100
 	));
101 101
 
102
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
102
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
103 103
 		'as' => 'aimeos_shop_account_favorite',
104 104
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
105 105
 	));
106 106
 
107
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
107
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
108 108
 		'as' => 'aimeos_shop_account_watch',
109 109
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
110 110
 	));
@@ -114,42 +114,42 @@  discard block
 block discarded – undo
114 114
 
115 115
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
116 116
 
117
-	Route::match( array( 'GET', 'POST' ), 'count', array(
117
+	Route::match(array('GET', 'POST'), 'count', array(
118 118
 		'as' => 'aimeos_shop_count',
119 119
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
120 120
 	));
121 121
 
122
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
122
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
123 123
 		'as' => 'aimeos_shop_detail',
124 124
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
125 125
 	));
126 126
 
127
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
127
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
128 128
 		'as' => 'aimeos_shop_session_pinned',
129 129
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
130 130
 	));
131 131
 
132
-	Route::match( array( 'GET', 'POST' ), 'list', array(
132
+	Route::match(array('GET', 'POST'), 'list', array(
133 133
 		'as' => 'aimeos_shop_list',
134 134
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
135 135
 	));
136 136
 
137
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
137
+	Route::match(array('GET', 'POST'), 'suggest', array(
138 138
 		'as' => 'aimeos_shop_suggest',
139 139
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
140 140
 	));
141 141
 
142
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
142
+	Route::match(array('GET', 'POST'), 'stock', array(
143 143
 		'as' => 'aimeos_shop_stock',
144 144
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
145 145
 	));
146 146
 
147
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
147
+	Route::match(array('GET', 'POST'), 'basket', array(
148 148
 		'as' => 'aimeos_shop_basket',
149 149
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
150 150
 	));
151 151
 
152
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
152
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
153 153
 		'as' => 'aimeos_shop_checkout',
154 154
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
155 155
 	));
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 
160 160
 Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() {
161 161
 
162
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
162
+	Route::match(array('GET', 'POST'), 'confirm', array(
163 163
 		'as' => 'aimeos_shop_confirm',
164 164
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
165 165
 	));
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 
170 170
 Route::group(config('shop.routes.update', []), function() {
171 171
 
172
-	Route::match( array( 'GET', 'POST' ), 'update', array(
172
+	Route::match(array('GET', 'POST'), 'update', array(
173 173
 		'as' => 'aimeos_shop_update',
174 174
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
175 175
 	));
Please login to merge, or discard this patch.