@@ -20,7 +20,7 @@ |
||
20 | 20 | * @covers JWT::__construct |
21 | 21 | */ |
22 | 22 | public static function setUpBeforeClass(): void { |
23 | - self::$ci =& get_instance(); |
|
23 | + self::$ci = & get_instance(); |
|
24 | 24 | } |
25 | 25 | /** |
26 | 26 | * [testLoadPackage description] |
@@ -3,54 +3,54 @@ |
||
3 | 3 | use PHPUnit\Framework\TestCase; |
4 | 4 | |
5 | 5 | class RefactorTest extends TestCase { |
6 | - /** |
|
7 | - * Code Igniter Instance. |
|
8 | - * @var object |
|
9 | - */ |
|
10 | - private static $ci; |
|
11 | - /** |
|
12 | - * Package name for simplicity |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - private const PACKAGE = "francis94c/refactor-ci"; |
|
6 | + /** |
|
7 | + * Code Igniter Instance. |
|
8 | + * @var object |
|
9 | + */ |
|
10 | + private static $ci; |
|
11 | + /** |
|
12 | + * Package name for simplicity |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + private const PACKAGE = "francis94c/refactor-ci"; |
|
16 | 16 | |
17 | - /** |
|
18 | - * Prerquisites for the Unit Tests. |
|
19 | - * |
|
20 | - * @covers JWT::__construct |
|
21 | - */ |
|
22 | - public static function setUpBeforeClass(): void { |
|
17 | + /** |
|
18 | + * Prerquisites for the Unit Tests. |
|
19 | + * |
|
20 | + * @covers JWT::__construct |
|
21 | + */ |
|
22 | + public static function setUpBeforeClass(): void { |
|
23 | 23 | self::$ci =& get_instance(); |
24 | - } |
|
25 | - /** |
|
26 | - * [testLoadPackage description] |
|
27 | - */ |
|
28 | - public function testLoadPackage():void { |
|
24 | + } |
|
25 | + /** |
|
26 | + * [testLoadPackage description] |
|
27 | + */ |
|
28 | + public function testLoadPackage():void { |
|
29 | 29 | self::$ci->load->package(self::PACKAGE); |
30 | 30 | $this->assertTrue(isset(self::$ci->refactor)); |
31 | - } |
|
32 | - /** |
|
33 | - * [testDirectUnsetRule description] |
|
34 | - * |
|
35 | - * @depends testLoadPackage |
|
36 | - */ |
|
37 | - public function testDirectUnsetRule():void { |
|
31 | + } |
|
32 | + /** |
|
33 | + * [testDirectUnsetRule description] |
|
34 | + * |
|
35 | + * @depends testLoadPackage |
|
36 | + */ |
|
37 | + public function testDirectUnsetRule():void { |
|
38 | 38 | $payload = [ |
39 | - 'name' => 'collins', |
|
40 | - 'pc_brand' => 'HP', |
|
41 | - 'phone' => '+2349086756453', |
|
42 | - 'school' => 'Delloite', |
|
43 | - 'company' => 'Google' |
|
39 | + 'name' => 'collins', |
|
40 | + 'pc_brand' => 'HP', |
|
41 | + 'phone' => '+2349086756453', |
|
42 | + 'school' => 'Delloite', |
|
43 | + 'company' => 'Google' |
|
44 | 44 | ]; |
45 | 45 | $rule = [ |
46 | - 'unset' => [ |
|
46 | + 'unset' => [ |
|
47 | 47 | 'school', |
48 | 48 | 'phone' |
49 | - ] |
|
49 | + ] |
|
50 | 50 | ]; |
51 | 51 | self::$ci->refactor->run($payload, $rule); |
52 | 52 | $this->assertFalse(isset($payload['school'])); |
53 | 53 | $this->assertFalse(isset($payload['phone'])); |
54 | 54 | $this->assertTrue(isset($payload['company'])); |
55 | - } |
|
55 | + } |
|
56 | 56 | } |
@@ -67,7 +67,9 @@ discard block |
||
67 | 67 | for ($x = 0; $x < count($array); $x++) { |
68 | 68 | $refactor->switchPayload($array[$x]); |
69 | 69 | $buff = $refactor->toArray(); |
70 | - if ($buff != null) $array[$x] = $buff; |
|
70 | + if ($buff != null) { |
|
71 | + $array[$x] = $buff; |
|
72 | + } |
|
71 | 73 | } |
72 | 74 | return $array; |
73 | 75 | } |
@@ -78,7 +80,9 @@ discard block |
||
78 | 80 | */ |
79 | 81 | function run(array &$object, $ruleName):void |
80 | 82 | { |
81 | - if ($object == null) return; |
|
83 | + if ($object == null) { |
|
84 | + return; |
|
85 | + } |
|
82 | 86 | // Reolve Rules. |
83 | 87 | if (is_scalar($ruleName)) { |
84 | 88 | $rule = $this->ci->config->item("refactor_$ruleName"); |
@@ -88,7 +92,10 @@ discard block |
||
88 | 92 | $rule = is_array($ruleName) ? $ruleName : null; |
89 | 93 | } |
90 | 94 | |
91 | - if ($rule == null) return; // No need to go further as rule doesn't exist. |
|
95 | + if ($rule == null) { |
|
96 | + return; |
|
97 | + } |
|
98 | + // No need to go further as rule doesn't exist. |
|
92 | 99 | // Keep |
93 | 100 | if (isset($rule['keep'])) { |
94 | 101 | $keys = array_keys($object); |
@@ -129,11 +136,15 @@ discard block |
||
129 | 136 | continue; |
130 | 137 | } |
131 | 138 | $object[$field] = $query->result_array()[0]; |
132 | - if (isset($data['refactor'])) $this->run($object[$field], $data['refactor']); |
|
139 | + if (isset($data['refactor'])) { |
|
140 | + $this->run($object[$field], $data['refactor']); |
|
141 | + } |
|
133 | 142 | continue; |
134 | 143 | } |
135 | 144 | if (isset($data['path'])) { |
136 | - if ($ids == null) return; |
|
145 | + if ($ids == null) { |
|
146 | + return; |
|
147 | + } |
|
137 | 148 | $object[$field] = $ids; |
138 | 149 | $this->ci->jsonp->parse($object[$field]); |
139 | 150 | if (is_array($object[$field])) { |
@@ -141,17 +152,23 @@ discard block |
||
141 | 152 | for ($x = 0; $x < count($refs); $x++) { |
142 | 153 | $refs[$x] = $this->inflate_value($data['table'], $refs[$x]); |
143 | 154 | // Recursion |
144 | - if (isset($data['refactor'])) $this->run($refs[$x], $data['refactor']); |
|
155 | + if (isset($data['refactor'])) { |
|
156 | + $this->run($refs[$x], $data['refactor']); |
|
157 | + } |
|
145 | 158 | } |
146 | 159 | } else { |
147 | 160 | $this->ci->jsonp->set($data['path'], $this->inflate_value($data['table'], $ids)); |
148 | 161 | // Recursion |
149 | - if (isset($data['refactor'])) $this->run($this->ci->jsonp->get_reference($data['path']), $data['refactor']); |
|
162 | + if (isset($data['refactor'])) { |
|
163 | + $this->run($this->ci->jsonp->get_reference($data['path']), $data['refactor']); |
|
164 | + } |
|
150 | 165 | } |
151 | 166 | return; |
152 | 167 | } |
153 | 168 | $object[$field] = []; |
154 | - if ($ids == null) return; |
|
169 | + if ($ids == null) { |
|
170 | + return; |
|
171 | + } |
|
155 | 172 | foreach($ids as $id) { |
156 | 173 | $this->ci->db->where($this->primaryKey, $id); |
157 | 174 | $query = $this->ci->db->get($data['table']); |
@@ -160,7 +177,9 @@ discard block |
||
160 | 177 | } |
161 | 178 | $object[$field][] = $query->result_array()[0]; |
162 | 179 | // Recursion |
163 | - if (isset($data['refactor'])) $this->run($object[$field][count($object[$field]) - 1], $data['refactor']); |
|
180 | + if (isset($data['refactor'])) { |
|
181 | + $this->run($object[$field][count($object[$field]) - 1], $data['refactor']); |
|
182 | + } |
|
164 | 183 | } |
165 | 184 | } |
166 | 185 | } |
@@ -3,31 +3,31 @@ discard block |
||
3 | 3 | |
4 | 4 | class RefactorCI |
5 | 5 | { |
6 | - /** |
|
7 | - * [private description] |
|
8 | - * @var [type] |
|
9 | - */ |
|
10 | - private $ci; |
|
6 | + /** |
|
7 | + * [private description] |
|
8 | + * @var [type] |
|
9 | + */ |
|
10 | + private $ci; |
|
11 | 11 | |
12 | - /** |
|
13 | - * [private description] |
|
14 | - * @var [type] |
|
15 | - */ |
|
16 | - private $primaryKey; |
|
12 | + /** |
|
13 | + * [private description] |
|
14 | + * @var [type] |
|
15 | + */ |
|
16 | + private $primaryKey; |
|
17 | 17 | |
18 | - /** |
|
19 | - * [public description] |
|
20 | - * @var [type] |
|
21 | - */ |
|
22 | - public const PACKAGE = 'francis94c/refactor-ci'; |
|
18 | + /** |
|
19 | + * [public description] |
|
20 | + * @var [type] |
|
21 | + */ |
|
22 | + public const PACKAGE = 'francis94c/refactor-ci'; |
|
23 | 23 | |
24 | - /** |
|
25 | - * [__construct description] |
|
26 | - * @date 2020-04-10 |
|
27 | - * @param [type] $params [description] |
|
28 | - */ |
|
29 | - public function __construct($params=null) |
|
30 | - { |
|
24 | + /** |
|
25 | + * [__construct description] |
|
26 | + * @date 2020-04-10 |
|
27 | + * @param [type] $params [description] |
|
28 | + */ |
|
29 | + public function __construct($params=null) |
|
30 | + { |
|
31 | 31 | $this->ci =& get_instance(); |
32 | 32 | $this->ci->load->config("refactor", false, true); |
33 | 33 | $this->ci->load->splint('francis94c/jsonp', '+JSONP', null, 'jsonp'); |
@@ -35,207 +35,207 @@ discard block |
||
35 | 35 | $this->init($params == null ? [] : $params); |
36 | 36 | |
37 | 37 | spl_autoload_register(function($name) { |
38 | - if ($name == 'RefactorPayload') { |
|
38 | + if ($name == 'RefactorPayload') { |
|
39 | 39 | require(APPPATH . 'splints/' . self::PACKAGE . '/libraries/RefactorPayload.php'); |
40 | 40 | return; |
41 | - } |
|
41 | + } |
|
42 | 42 | |
43 | - if (file_exists(APPPATH . "payloads/$name.php")) { |
|
43 | + if (file_exists(APPPATH . "payloads/$name.php")) { |
|
44 | 44 | require(APPPATH . "payloads/$name.php"); |
45 | 45 | return; |
46 | - } |
|
46 | + } |
|
47 | 47 | |
48 | - require(APPPATH . "libraries/refactor/$name.php"); // @deprecated |
|
48 | + require(APPPATH . "libraries/refactor/$name.php"); // @deprecated |
|
49 | 49 | }); |
50 | - } |
|
51 | - /** |
|
52 | - * [init description] |
|
53 | - * @date 2019-11-02 |
|
54 | - * @param array $params [description] |
|
55 | - */ |
|
56 | - public function init(array $params):void |
|
57 | - { |
|
50 | + } |
|
51 | + /** |
|
52 | + * [init description] |
|
53 | + * @date 2019-11-02 |
|
54 | + * @param array $params [description] |
|
55 | + */ |
|
56 | + public function init(array $params):void |
|
57 | + { |
|
58 | 58 | $this->primaryKey = $params['primary_key'] ?? 'id'; |
59 | - } |
|
60 | - /** |
|
61 | - * [load description] |
|
62 | - * @date 2019-11-02 |
|
63 | - * @return RefactorCI [description] |
|
64 | - */ |
|
65 | - public function load($class):RefactorCI |
|
66 | - { |
|
59 | + } |
|
60 | + /** |
|
61 | + * [load description] |
|
62 | + * @date 2019-11-02 |
|
63 | + * @return RefactorCI [description] |
|
64 | + */ |
|
65 | + public function load($class):RefactorCI |
|
66 | + { |
|
67 | 67 | require_once(APPPATH.'libraries/refactor/'.$class.'.php'); |
68 | 68 | return $this; |
69 | - } |
|
70 | - /** |
|
71 | - * [payload description] |
|
72 | - * @date 2019-11-02 |
|
73 | - * @param string $class [description] |
|
74 | - * @param [type] $object [description] |
|
75 | - * @return [type] [description] |
|
76 | - */ |
|
77 | - public function payload(string $class, $object) |
|
78 | - { |
|
69 | + } |
|
70 | + /** |
|
71 | + * [payload description] |
|
72 | + * @date 2019-11-02 |
|
73 | + * @param string $class [description] |
|
74 | + * @param [type] $object [description] |
|
75 | + * @return [type] [description] |
|
76 | + */ |
|
77 | + public function payload(string $class, $object) |
|
78 | + { |
|
79 | 79 | return (new $class($object))->toArray(); |
80 | - } |
|
81 | - /** |
|
82 | - * [array description] |
|
83 | - * @date 2019-11-02 |
|
84 | - * @param string $class [description] |
|
85 | - * @param array $array [description] |
|
86 | - * @return array [description] |
|
87 | - */ |
|
88 | - public function array(string $class, array $array):array |
|
89 | - { |
|
80 | + } |
|
81 | + /** |
|
82 | + * [array description] |
|
83 | + * @date 2019-11-02 |
|
84 | + * @param string $class [description] |
|
85 | + * @param array $array [description] |
|
86 | + * @return array [description] |
|
87 | + */ |
|
88 | + public function array(string $class, array $array):array |
|
89 | + { |
|
90 | 90 | $refactor = new $class(); |
91 | 91 | $buff; |
92 | 92 | for ($x = 0; $x < count($array); $x++) { |
93 | - $refactor->switchPayload($array[$x]); |
|
94 | - $buff = $refactor->toArray(); |
|
95 | - if ($buff != null) $array[$x] = $buff; |
|
93 | + $refactor->switchPayload($array[$x]); |
|
94 | + $buff = $refactor->toArray(); |
|
95 | + if ($buff != null) $array[$x] = $buff; |
|
96 | 96 | } |
97 | 97 | return $array; |
98 | - } |
|
99 | - /** |
|
100 | - * [run description] |
|
101 | - * @param array|string $object [description] |
|
102 | - * @param string $ruleName [description] |
|
103 | - */ |
|
104 | - function run(array &$object, $ruleName):void |
|
105 | - { |
|
98 | + } |
|
99 | + /** |
|
100 | + * [run description] |
|
101 | + * @param array|string $object [description] |
|
102 | + * @param string $ruleName [description] |
|
103 | + */ |
|
104 | + function run(array &$object, $ruleName):void |
|
105 | + { |
|
106 | 106 | if ($object == null) return; |
107 | 107 | // Reolve Rules. |
108 | 108 | if (is_scalar($ruleName)) { |
109 | - $rule = $this->ci->config->item("refactor_$ruleName"); |
|
109 | + $rule = $this->ci->config->item("refactor_$ruleName"); |
|
110 | 110 | } else { |
111 | - // Rule was probablt passed in as an array (associative) and we support |
|
112 | - // that. |
|
113 | - $rule = is_array($ruleName) ? $ruleName : null; |
|
111 | + // Rule was probablt passed in as an array (associative) and we support |
|
112 | + // that. |
|
113 | + $rule = is_array($ruleName) ? $ruleName : null; |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | if ($rule == null) return; // No need to go further as rule doesn't exist. |
117 | 117 | // Keep |
118 | 118 | if (isset($rule['keep'])) { |
119 | - $keys = array_keys($object); |
|
120 | - for ($x = 0; $x < count($object); $x++) { |
|
119 | + $keys = array_keys($object); |
|
120 | + for ($x = 0; $x < count($object); $x++) { |
|
121 | 121 | if (!in_array($keys[$X], $rule['keep'])) { |
122 | - unset($object[$keys[$x]]); |
|
122 | + unset($object[$keys[$x]]); |
|
123 | + } |
|
123 | 124 | } |
124 | - } |
|
125 | 125 | } |
126 | 126 | // Unset |
127 | 127 | if (isset($rule['unset'])) { |
128 | - $this->unset_values($object, $rule); |
|
128 | + $this->unset_values($object, $rule); |
|
129 | 129 | } |
130 | 130 | // Replace |
131 | 131 | if (isset($rule['replace'])) { |
132 | - $this->replace_fields($object, $rule); |
|
132 | + $this->replace_fields($object, $rule); |
|
133 | 133 | } |
134 | 134 | // Bools |
135 | 135 | if (isset($rule['bools'])) { |
136 | - foreach($rule['bools'] as $boolKey) { |
|
136 | + foreach($rule['bools'] as $boolKey) { |
|
137 | 137 | $object[$boolKey] = $object[$boolKey] == 1 || $object[$boolKey] == 'true'; |
138 | - } |
|
138 | + } |
|
139 | 139 | } |
140 | 140 | // Cast |
141 | 141 | if (isset($rule['cast'])) { |
142 | - $this->cast_fields($object, $rule); |
|
142 | + $this->cast_fields($object, $rule); |
|
143 | 143 | } |
144 | 144 | // Inflate |
145 | 145 | if (isset($rule['inflate'])) { |
146 | - foreach($rule['inflate'] as $field => $data) { |
|
146 | + foreach($rule['inflate'] as $field => $data) { |
|
147 | 147 | $ids = json_decode($object[$field], true); |
148 | 148 | if (is_scalar($ids)) { |
149 | - // JSON Array wasn't supplied. Let's treat it as a scaler ID. |
|
150 | - $this->ci->db->where($this->primaryKey, $ids); |
|
151 | - $query = $this->ci->db->get($data['table']); |
|
152 | - if ($query->num_rows() == 0) { |
|
149 | + // JSON Array wasn't supplied. Let's treat it as a scaler ID. |
|
150 | + $this->ci->db->where($this->primaryKey, $ids); |
|
151 | + $query = $this->ci->db->get($data['table']); |
|
152 | + if ($query->num_rows() == 0) { |
|
153 | 153 | $object[$field] = json_encode (json_decode ("{}")); |
154 | 154 | continue; |
155 | - } |
|
156 | - $object[$field] = $query->result_array()[0]; |
|
157 | - if (isset($data['refactor'])) $this->run($object[$field], $data['refactor']); |
|
158 | - continue; |
|
155 | + } |
|
156 | + $object[$field] = $query->result_array()[0]; |
|
157 | + if (isset($data['refactor'])) $this->run($object[$field], $data['refactor']); |
|
158 | + continue; |
|
159 | 159 | } |
160 | 160 | if (isset($data['path'])) { |
161 | - if ($ids == null) return; |
|
162 | - $object[$field] = $ids; |
|
163 | - $this->ci->jsonp->parse($object[$field]); |
|
164 | - if (is_array($object[$field])) { |
|
161 | + if ($ids == null) return; |
|
162 | + $object[$field] = $ids; |
|
163 | + $this->ci->jsonp->parse($object[$field]); |
|
164 | + if (is_array($object[$field])) { |
|
165 | 165 | $refs = $this->ci->jsonp->get_reference($data['path']); |
166 | 166 | for ($x = 0; $x < count($refs); $x++) { |
167 | - $refs[$x] = $this->inflate_value($data['table'], $refs[$x]); |
|
168 | - // Recursion |
|
169 | - if (isset($data['refactor'])) $this->run($refs[$x], $data['refactor']); |
|
167 | + $refs[$x] = $this->inflate_value($data['table'], $refs[$x]); |
|
168 | + // Recursion |
|
169 | + if (isset($data['refactor'])) $this->run($refs[$x], $data['refactor']); |
|
170 | 170 | } |
171 | - } else { |
|
171 | + } else { |
|
172 | 172 | $this->ci->jsonp->set($data['path'], $this->inflate_value($data['table'], $ids)); |
173 | 173 | // Recursion |
174 | 174 | if (isset($data['refactor'])) $this->run($this->ci->jsonp->get_reference($data['path']), $data['refactor']); |
175 | - } |
|
176 | - return; |
|
175 | + } |
|
176 | + return; |
|
177 | 177 | } |
178 | 178 | $object[$field] = []; |
179 | 179 | if ($ids == null) return; |
180 | 180 | foreach($ids as $id) { |
181 | - $this->ci->db->where($this->primaryKey, $id); |
|
182 | - $query = $this->ci->db->get($data['table']); |
|
183 | - if ($query->num_rows() == 0) { |
|
181 | + $this->ci->db->where($this->primaryKey, $id); |
|
182 | + $query = $this->ci->db->get($data['table']); |
|
183 | + if ($query->num_rows() == 0) { |
|
184 | 184 | continue; |
185 | - } |
|
186 | - $object[$field][] = $query->result_array()[0]; |
|
187 | - // Recursion |
|
188 | - if (isset($data['refactor'])) $this->run($object[$field][count($object[$field]) - 1], $data['refactor']); |
|
185 | + } |
|
186 | + $object[$field][] = $query->result_array()[0]; |
|
187 | + // Recursion |
|
188 | + if (isset($data['refactor'])) $this->run($object[$field][count($object[$field]) - 1], $data['refactor']); |
|
189 | + } |
|
189 | 190 | } |
190 | - } |
|
191 | 191 | } |
192 | - } |
|
193 | - private function inflate_value(string $table, $value) |
|
194 | - { |
|
192 | + } |
|
193 | + private function inflate_value(string $table, $value) |
|
194 | + { |
|
195 | 195 | $this->ci->db->where($this->primaryKey, $value); |
196 | 196 | $query = $this->ci->db->get($table); |
197 | 197 | return $query->num_rows() > 0 ? $query->result_array()[0] : null; |
198 | - } |
|
199 | - /** |
|
200 | - * [unset_values description] |
|
201 | - * @param array $object Object to Refactor. |
|
202 | - * @param array $rule Rule data, containing keys to unset in the given |
|
203 | - * associative array. |
|
204 | - */ |
|
205 | - private function unset_values(array &$object, &$rule):void { |
|
198 | + } |
|
199 | + /** |
|
200 | + * [unset_values description] |
|
201 | + * @param array $object Object to Refactor. |
|
202 | + * @param array $rule Rule data, containing keys to unset in the given |
|
203 | + * associative array. |
|
204 | + */ |
|
205 | + private function unset_values(array &$object, &$rule):void { |
|
206 | 206 | foreach($rule['unset'] as $key) { |
207 | - unset($object[$key]); |
|
208 | - } |
|
209 | - } |
|
210 | - /** |
|
211 | - * [replace_fields description] |
|
212 | - * @param array $object [description] |
|
213 | - * @param [type] $rule [description] |
|
214 | - */ |
|
215 | - private function replace_fields(array &$object, &$rule):void |
|
216 | - { |
|
207 | + unset($object[$key]); |
|
208 | + } |
|
209 | + } |
|
210 | + /** |
|
211 | + * [replace_fields description] |
|
212 | + * @param array $object [description] |
|
213 | + * @param [type] $rule [description] |
|
214 | + */ |
|
215 | + private function replace_fields(array &$object, &$rule):void |
|
216 | + { |
|
217 | 217 | foreach ($rule['replace'] as $oldKey => $newKey) { |
218 | - $object[$newKey] = $object[$oldKey]; |
|
219 | - unset($object[$oldKey]); |
|
220 | - } |
|
221 | - } |
|
222 | - /** |
|
223 | - * [cast_fields description] |
|
224 | - * @param array $object [description] |
|
225 | - * @param [type] $rule [description] |
|
226 | - */ |
|
227 | - private function cast_fields(array &$object, &$rule):void |
|
228 | - { |
|
218 | + $object[$newKey] = $object[$oldKey]; |
|
219 | + unset($object[$oldKey]); |
|
220 | + } |
|
221 | + } |
|
222 | + /** |
|
223 | + * [cast_fields description] |
|
224 | + * @param array $object [description] |
|
225 | + * @param [type] $rule [description] |
|
226 | + */ |
|
227 | + private function cast_fields(array &$object, &$rule):void |
|
228 | + { |
|
229 | 229 | foreach ($rule['cast'] as $key => $type) { |
230 | - switch ($type) { |
|
230 | + switch ($type) { |
|
231 | 231 | case 'int': |
232 | 232 | $object[$key] = (int) $object[$key]; |
233 | - break; |
|
233 | + break; |
|
234 | 234 | case 'string': |
235 | 235 | $object[$key] = (string) $object[$key]; |
236 | - break; |
|
237 | - } |
|
236 | + break; |
|
237 | + } |
|
238 | + } |
|
238 | 239 | } |
239 | - } |
|
240 | 240 | } |
241 | 241 | ?> |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | * @date 2020-04-10 |
27 | 27 | * @param [type] $params [description] |
28 | 28 | */ |
29 | - public function __construct($params=null) |
|
29 | + public function __construct($params = null) |
|
30 | 30 | { |
31 | - $this->ci =& get_instance(); |
|
31 | + $this->ci = & get_instance(); |
|
32 | 32 | $this->ci->load->config("refactor", false, true); |
33 | 33 | $this->ci->load->splint('francis94c/jsonp', '+JSONP', null, 'jsonp'); |
34 | 34 | |
@@ -36,16 +36,16 @@ discard block |
||
36 | 36 | |
37 | 37 | spl_autoload_register(function($name) { |
38 | 38 | if ($name == 'RefactorPayload') { |
39 | - require(APPPATH . 'splints/' . self::PACKAGE . '/libraries/RefactorPayload.php'); |
|
39 | + require(APPPATH.'splints/'.self::PACKAGE.'/libraries/RefactorPayload.php'); |
|
40 | 40 | return; |
41 | 41 | } |
42 | 42 | |
43 | - if (file_exists(APPPATH . "payloads/$name.php")) { |
|
44 | - require(APPPATH . "payloads/$name.php"); |
|
43 | + if (file_exists(APPPATH."payloads/$name.php")) { |
|
44 | + require(APPPATH."payloads/$name.php"); |
|
45 | 45 | return; |
46 | 46 | } |
47 | 47 | |
48 | - require(APPPATH . "libraries/refactor/$name.php"); // @deprecated |
|
48 | + require(APPPATH."libraries/refactor/$name.php"); // @deprecated |
|
49 | 49 | }); |
50 | 50 | } |
51 | 51 | /** |
@@ -133,24 +133,24 @@ discard block |
||
133 | 133 | } |
134 | 134 | // Bools |
135 | 135 | if (isset($rule['bools'])) { |
136 | - foreach($rule['bools'] as $boolKey) { |
|
136 | + foreach ($rule['bools'] as $boolKey) { |
|
137 | 137 | $object[$boolKey] = $object[$boolKey] == 1 || $object[$boolKey] == 'true'; |
138 | 138 | } |
139 | 139 | } |
140 | 140 | // Cast |
141 | - if (isset($rule['cast'])) { |
|
141 | + if (isset($rule['cast'])) { |
|
142 | 142 | $this->cast_fields($object, $rule); |
143 | 143 | } |
144 | 144 | // Inflate |
145 | 145 | if (isset($rule['inflate'])) { |
146 | - foreach($rule['inflate'] as $field => $data) { |
|
146 | + foreach ($rule['inflate'] as $field => $data) { |
|
147 | 147 | $ids = json_decode($object[$field], true); |
148 | 148 | if (is_scalar($ids)) { |
149 | 149 | // JSON Array wasn't supplied. Let's treat it as a scaler ID. |
150 | 150 | $this->ci->db->where($this->primaryKey, $ids); |
151 | 151 | $query = $this->ci->db->get($data['table']); |
152 | 152 | if ($query->num_rows() == 0) { |
153 | - $object[$field] = json_encode (json_decode ("{}")); |
|
153 | + $object[$field] = json_encode(json_decode("{}")); |
|
154 | 154 | continue; |
155 | 155 | } |
156 | 156 | $object[$field] = $query->result_array()[0]; |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | } |
178 | 178 | $object[$field] = []; |
179 | 179 | if ($ids == null) return; |
180 | - foreach($ids as $id) { |
|
180 | + foreach ($ids as $id) { |
|
181 | 181 | $this->ci->db->where($this->primaryKey, $id); |
182 | 182 | $query = $this->ci->db->get($data['table']); |
183 | 183 | if ($query->num_rows() == 0) { |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * associative array. |
204 | 204 | */ |
205 | 205 | private function unset_values(array &$object, &$rule):void { |
206 | - foreach($rule['unset'] as $key) { |
|
206 | + foreach ($rule['unset'] as $key) { |
|
207 | 207 | unset($object[$key]); |
208 | 208 | } |
209 | 209 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * @date 2019-11-02 |
12 | 12 | * @param array $payload [description] |
13 | 13 | */ |
14 | - public function __construct($payload=[]) |
|
14 | + public function __construct($payload = []) |
|
15 | 15 | { |
16 | 16 | $this->payload = $payload; |
17 | 17 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function switchPayload(&$payload):void |
71 | 71 | { |
72 | - $this->payload =& $payload; |
|
72 | + $this->payload = & $payload; |
|
73 | 73 | } |
74 | 74 | /** |
75 | 75 | * [toArray description] |
@@ -5,104 +5,104 @@ |
||
5 | 5 | |
6 | 6 | class RefactorPayload |
7 | 7 | { |
8 | - protected $payload; |
|
9 | - /** |
|
10 | - * [__construct description] |
|
11 | - * @date 2019-11-02 |
|
12 | - * @param array $payload [description] |
|
13 | - */ |
|
14 | - public function __construct($payload=[]) |
|
15 | - { |
|
8 | + protected $payload; |
|
9 | + /** |
|
10 | + * [__construct description] |
|
11 | + * @date 2019-11-02 |
|
12 | + * @param array $payload [description] |
|
13 | + */ |
|
14 | + public function __construct($payload=[]) |
|
15 | + { |
|
16 | 16 | $this->payload = $payload; |
17 | - } |
|
18 | - /** |
|
19 | - * [__set description] |
|
20 | - * @date 2019-11-02 |
|
21 | - * @param string $key [description] |
|
22 | - * @param [type] $value [description] |
|
23 | - */ |
|
24 | - public function __set(string $key, $value):void |
|
25 | - { |
|
17 | + } |
|
18 | + /** |
|
19 | + * [__set description] |
|
20 | + * @date 2019-11-02 |
|
21 | + * @param string $key [description] |
|
22 | + * @param [type] $value [description] |
|
23 | + */ |
|
24 | + public function __set(string $key, $value):void |
|
25 | + { |
|
26 | 26 | if (is_object($this->payload)) { |
27 | - $this->payload->$key = $value; |
|
28 | - return; |
|
27 | + $this->payload->$key = $value; |
|
28 | + return; |
|
29 | 29 | } |
30 | 30 | $this->payload[$key] = $value; |
31 | - } |
|
32 | - /** |
|
33 | - * [__unset description] |
|
34 | - * @date 2019-11-02 |
|
35 | - * @param string $key [description] |
|
36 | - */ |
|
37 | - public function __unset(string $key):void |
|
38 | - { |
|
31 | + } |
|
32 | + /** |
|
33 | + * [__unset description] |
|
34 | + * @date 2019-11-02 |
|
35 | + * @param string $key [description] |
|
36 | + */ |
|
37 | + public function __unset(string $key):void |
|
38 | + { |
|
39 | 39 | if (is_object($this->payload)) { |
40 | - unset($this->payload->$key); |
|
41 | - return; |
|
40 | + unset($this->payload->$key); |
|
41 | + return; |
|
42 | 42 | } |
43 | 43 | unset($this->payload[$key]); |
44 | - } |
|
45 | - /** |
|
46 | - * [__get description] |
|
47 | - * @date 2019-11-02 |
|
48 | - * @param string $key [description] |
|
49 | - * @return [type] [description] |
|
50 | - */ |
|
51 | - public function __get(string $key) |
|
52 | - { |
|
44 | + } |
|
45 | + /** |
|
46 | + * [__get description] |
|
47 | + * @date 2019-11-02 |
|
48 | + * @param string $key [description] |
|
49 | + * @return [type] [description] |
|
50 | + */ |
|
51 | + public function __get(string $key) |
|
52 | + { |
|
53 | 53 | if (is_object($this->payload)) return $this->payload->$key; |
54 | 54 | return $this->payload[$key]; |
55 | - } |
|
56 | - /** |
|
57 | - * [__toString description] |
|
58 | - * @date 2019-11-03 |
|
59 | - * @return string [description] |
|
60 | - */ |
|
61 | - public function __toString():string |
|
62 | - { |
|
55 | + } |
|
56 | + /** |
|
57 | + * [__toString description] |
|
58 | + * @date 2019-11-03 |
|
59 | + * @return string [description] |
|
60 | + */ |
|
61 | + public function __toString():string |
|
62 | + { |
|
63 | 63 | $buff = $refactor->toArray(); |
64 | 64 | if ($buff != null) return json_encode($buff); |
65 | 65 | |
66 | 66 | return json_encode($this->payload); |
67 | - } |
|
68 | - /** |
|
69 | - * [__debugInfo description] |
|
70 | - * @date 2019-11-03 |
|
71 | - * @return [type] [description] |
|
72 | - */ |
|
73 | - public function __debugInfo():array |
|
74 | - { |
|
67 | + } |
|
68 | + /** |
|
69 | + * [__debugInfo description] |
|
70 | + * @date 2019-11-03 |
|
71 | + * @return [type] [description] |
|
72 | + */ |
|
73 | + public function __debugInfo():array |
|
74 | + { |
|
75 | 75 | return [ |
76 | - 'payload' => $this->payload |
|
76 | + 'payload' => $this->payload |
|
77 | 77 | ]; |
78 | - } |
|
79 | - /** |
|
80 | - * [setPayload description] |
|
81 | - * @date 2019-11-02 |
|
82 | - * @param [type] $payload [description] |
|
83 | - */ |
|
84 | - public function setPayload($payload):void |
|
85 | - { |
|
78 | + } |
|
79 | + /** |
|
80 | + * [setPayload description] |
|
81 | + * @date 2019-11-02 |
|
82 | + * @param [type] $payload [description] |
|
83 | + */ |
|
84 | + public function setPayload($payload):void |
|
85 | + { |
|
86 | 86 | $this->payload = $payload; |
87 | - } |
|
88 | - /** |
|
89 | - * [set_payload description] |
|
90 | - * @date 2019-11-02 |
|
91 | - * @param array $payload [description] |
|
92 | - */ |
|
93 | - public function switchPayload(&$payload):void |
|
94 | - { |
|
87 | + } |
|
88 | + /** |
|
89 | + * [set_payload description] |
|
90 | + * @date 2019-11-02 |
|
91 | + * @param array $payload [description] |
|
92 | + */ |
|
93 | + public function switchPayload(&$payload):void |
|
94 | + { |
|
95 | 95 | $this->payload =& $payload; |
96 | - } |
|
97 | - /** |
|
98 | - * [toArray description] |
|
99 | - * @date 2019-11-02 |
|
100 | - * @return array [description] |
|
101 | - */ |
|
102 | - public function toArray():array |
|
103 | - { |
|
96 | + } |
|
97 | + /** |
|
98 | + * [toArray description] |
|
99 | + * @date 2019-11-02 |
|
100 | + * @return array [description] |
|
101 | + */ |
|
102 | + public function toArray():array |
|
103 | + { |
|
104 | 104 | if (is_array($this->payload)) return $this->payload; |
105 | 105 | return json_decode(json_encode($this->payload), true); |
106 | - } |
|
106 | + } |
|
107 | 107 | } |
108 | 108 | ?> |
@@ -50,7 +50,9 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function __get(string $key) |
52 | 52 | { |
53 | - if (is_object($this->payload)) return $this->payload->$key; |
|
53 | + if (is_object($this->payload)) { |
|
54 | + return $this->payload->$key; |
|
55 | + } |
|
54 | 56 | return $this->payload[$key]; |
55 | 57 | } |
56 | 58 | /** |
@@ -61,7 +63,9 @@ discard block |
||
61 | 63 | public function __toString():string |
62 | 64 | { |
63 | 65 | $buff = $refactor->toArray(); |
64 | - if ($buff != null) return json_encode($buff); |
|
66 | + if ($buff != null) { |
|
67 | + return json_encode($buff); |
|
68 | + } |
|
65 | 69 | |
66 | 70 | return json_encode($this->payload); |
67 | 71 | } |
@@ -101,7 +105,9 @@ discard block |
||
101 | 105 | */ |
102 | 106 | public function toArray():array |
103 | 107 | { |
104 | - if (is_array($this->payload)) return $this->payload; |
|
108 | + if (is_array($this->payload)) { |
|
109 | + return $this->payload; |
|
110 | + } |
|
105 | 111 | return json_decode(json_encode($this->payload), true); |
106 | 112 | } |
107 | 113 | } |
@@ -3,55 +3,55 @@ |
||
3 | 3 | |
4 | 4 | class RefactorArray implements ArrayAccess, Countable |
5 | 5 | { |
6 | - /** |
|
7 | - * [private description] |
|
8 | - * @var [type] |
|
9 | - */ |
|
10 | - private $data = array(); |
|
11 | - /** |
|
12 | - * [offsetSet description] |
|
13 | - * @date 2019-11-02 |
|
14 | - * @param [type] $offset [description] |
|
15 | - * @param [type] $value [description] |
|
16 | - */ |
|
17 | - public function offsetSet($offset, $value) |
|
18 | - { |
|
6 | + /** |
|
7 | + * [private description] |
|
8 | + * @var [type] |
|
9 | + */ |
|
10 | + private $data = array(); |
|
11 | + /** |
|
12 | + * [offsetSet description] |
|
13 | + * @date 2019-11-02 |
|
14 | + * @param [type] $offset [description] |
|
15 | + * @param [type] $value [description] |
|
16 | + */ |
|
17 | + public function offsetSet($offset, $value) |
|
18 | + { |
|
19 | 19 | $this->data[$offset] = $value; |
20 | - } |
|
21 | - /** |
|
22 | - * [offsetExists description] |
|
23 | - * @date 2019-11-02 |
|
24 | - * @param [type] $offset [description] |
|
25 | - */ |
|
26 | - public function offsetExists($offset) |
|
27 | - { |
|
20 | + } |
|
21 | + /** |
|
22 | + * [offsetExists description] |
|
23 | + * @date 2019-11-02 |
|
24 | + * @param [type] $offset [description] |
|
25 | + */ |
|
26 | + public function offsetExists($offset) |
|
27 | + { |
|
28 | 28 | return isset($this->data[$offset]); |
29 | - } |
|
30 | - /** |
|
31 | - * [offsetUnset description] |
|
32 | - * @date 2019-11-02 |
|
33 | - * @param [type] $offset [description] |
|
34 | - */ |
|
35 | - public function offsetUnset($offset) |
|
36 | - { |
|
29 | + } |
|
30 | + /** |
|
31 | + * [offsetUnset description] |
|
32 | + * @date 2019-11-02 |
|
33 | + * @param [type] $offset [description] |
|
34 | + */ |
|
35 | + public function offsetUnset($offset) |
|
36 | + { |
|
37 | 37 | unset($this->data[$offset]); |
38 | - } |
|
39 | - /** |
|
40 | - * [offsetGet description] |
|
41 | - * @date 2019-11-02 |
|
42 | - * @param [type] $offset [description] |
|
43 | - */ |
|
44 | - public function offsetGet($offset) |
|
45 | - { |
|
38 | + } |
|
39 | + /** |
|
40 | + * [offsetGet description] |
|
41 | + * @date 2019-11-02 |
|
42 | + * @param [type] $offset [description] |
|
43 | + */ |
|
44 | + public function offsetGet($offset) |
|
45 | + { |
|
46 | 46 | return ($this->offsetExists($offset)) ? $this->data[$offset] : null; |
47 | - } |
|
48 | - /** |
|
49 | - * [count description] |
|
50 | - * @date 2019-11-02 |
|
51 | - * @return [type] [description] |
|
52 | - */ |
|
53 | - public function count() |
|
54 | - { |
|
47 | + } |
|
48 | + /** |
|
49 | + * [count description] |
|
50 | + * @date 2019-11-02 |
|
51 | + * @return [type] [description] |
|
52 | + */ |
|
53 | + public function count() |
|
54 | + { |
|
55 | 55 | return count($this->_data); |
56 | - } |
|
56 | + } |
|
57 | 57 | } |