Completed
Pull Request — master (#46)
by Walt
25:28 queued 05:28
created
modules/WebSockets/functions.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@
 block discarded – undo
13 13
 	React\EventLoop\Factory as Loop_factory,
14 14
 	cs\Config;
15 15
 /**
16
- * @return bool
17
- */
16
+	 * @return bool
17
+	 */
18 18
 function is_server_running () {
19 19
 	$connected = false;
20 20
 	$servers   = Pool::instance()->get_all();
Please login to merge, or discard this patch.
modules/WebSockets/Server.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 		// Disable all versions except RFC6455, which is supported by all modern browsers
141 141
 		$ws_server->disableVersion(0);
142 142
 		$ws_server->disableVersion(6);
143
-		$this->io_server        = IoServer::factory(
143
+		$this->io_server = IoServer::factory(
144 144
 			new HttpServer($ws_server),
145 145
 			$this->listen_port,
146 146
 			$this->listen_locally
Please login to merge, or discard this patch.
modules/Shop/Attributes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	use
21 21
 		CRUD,
22 22
 		Singleton;
23
-	protected $data_model          = [
23
+	protected $data_model = [
24 24
 		'id'     => 'int',
25 25
 		'title'  => 'ml:text',
26 26
 		'path'   => 'ml:text',
Please login to merge, or discard this patch.
modules/Shop/Order_statuses.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	use
21 21
 		CRUD,
22 22
 		Singleton;
23
-	protected $data_model          = [
23
+	protected $data_model = [
24 24
 		'id'     => 'int',
25 25
 		'title'  => 'ml:text',
26 26
 		'path'   => 'ml:text',
Please login to merge, or discard this patch.
modules/Shop/Orders.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 
68 68
 	const PAYMENT_METHOD_CASH = 'shop:cash';
69 69
 
70
-	protected $data_model            = [
70
+	protected $data_model = [
71 71
 		'id'                => 'int',
72 72
 		'user'              => 'int',
73 73
 		'date'              => 'int',
Please login to merge, or discard this patch.
modules/Shop/Shipping_types.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	use
21 21
 		CRUD,
22 22
 		Singleton;
23
-	protected $data_model          = [
23
+	protected $data_model = [
24 24
 		'id'     => 'int',
25 25
 		'title'  => 'ml:text',
26 26
 		'path'   => 'ml:text',
Please login to merge, or discard this patch.
modules/Shop/items_.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	':',
24 24
 	array_slice(Route::instance()->path, -1)[0]
25 25
 );
26
-$item       = $Items->get_for_user(array_pop($item));
26
+$item = $Items->get_for_user(array_pop($item));
27 27
 $Page->title($item['title']);
28 28
 $Page->Description = description($item['description']);
29 29
 $Page->canonical_url(
Please login to merge, or discard this patch.
modules/Shop/orders_.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 $page           = @$_GET['page'] ?: 1;
26 26
 $count          = @$_GET['count'] ?: Config::instance()->module('Shop')->items_per_page;
27 27
 if ($Session->user()) {
28
-	$orders       = $Orders->get(
28
+	$orders = $Orders->get(
29 29
 		$Orders->search(
30 30
 			[
31 31
 				'user' => $Session->get_user()
Please login to merge, or discard this patch.
modules/Shop/admin/categories.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,8 @@
 block discarded – undo
24 24
 			$parent != $category['id'] // infinite loop protection
25 25
 		) {
26 26
 			$parent = $Categories->get($category['parent']);
27
-			if ($parent['parent'] == $category['id']) { // infinite loop protection
27
+			if ($parent['parent'] == $category['id']) {
28
+// infinite loop protection
28 29
 				break;
29 30
 			}
30 31
 			$category['title'] = "$parent[title] :: $category[title]";
Please login to merge, or discard this patch.